Explorar o código

* Make Application available witout needing custapache(*)

Michael VAN CANNEYT %!s(int64=2) %!d(string=hai) anos
pai
achega
03e70a6d13

+ 11 - 3
packages/fcl-web/src/base/fpapache.pp

@@ -43,12 +43,20 @@ Type
     Property WorkingWebModuleCount;
   end;
 
+Function Application : TCustomApacheApplication;
+
 Implementation
 
+Function Application : TCustomApacheApplication;
+
+begin
+  Result:=CustApache.Application;
+end;
+
 Procedure InitApache;
 
 begin
-  Application:=TApacheApplication.Create(Nil);
+  custapache.Application:=TApacheApplication.Create(Nil);
   if not assigned(CustomApplication) then
     CustomApplication := Application;
 end;
@@ -57,9 +65,9 @@ Procedure DoneApache;
 
 begin
   Try
-    if CustomApplication=Application then
+    if CustomApplication=CustApache.Application then
       CustomApplication := nil;
-    FreeAndNil(Application);
+    FreeAndNil(CustApache.Application);
   except
     if ShowCleanUpErrors then
       Raise;

+ 12 - 4
packages/fcl-web/src/base/fpapache24.pp

@@ -44,23 +44,31 @@ Type
   end;
 
 
+Function Application : TCustomApacheApplication;
+
 Implementation
 
+Function Application : TCustomApacheApplication;
+
+begin
+  Result:=CustApache24.Application;
+end;
+
 Procedure InitApache;
 
 begin
-  Application:=TApacheApplication.Create(Nil);
+  CustApache24.Application:=TApacheApplication.Create(Nil);
   if not assigned(CustomApplication) then
-    CustomApplication := Application;
+    CustomApplication := CustApache24.Application;
 end;
 
 Procedure DoneApache;
 
 begin
   Try
-    if CustomApplication=Application then
+    if CustomApplication=CustApache24.Application then
       CustomApplication := nil;
-    FreeAndNil(Application);
+    FreeAndNil(CustApache24.Application);
   except
     if ShowCleanUpErrors then
       Raise;