[mapguide-commits] r9600 - trunk/MgDev/Web/src/ApacheAgent

[svn_mapguide at osgeo.org]

Author: jng
Date: 2019-09-11 04:07:08 -0700 (Wed, 11 Sep 2019)
New Revision: 9600

Modified:
   trunk/MgDev/Web/src/ApacheAgent/ApacheAgent.cpp
Log:
I was debugging a mysterious crash in httpd and encountered a case which is suspiciously similar to #2224.

This commit does not fix that problem. It merely moves the call to ApacheAgent.Initialize() into the main try/catch block of mgmapagent_handler() so that any exceptions thrown does not take down httpd.exe 

Modified: trunk/MgDev/Web/src/ApacheAgent/ApacheAgent.cpp
===================================================================
--- trunk/MgDev/Web/src/ApacheAgent/ApacheAgent.cpp	2019-09-11 07:21:40 UTC (rev 9599)
+++ trunk/MgDev/Web/src/ApacheAgent/ApacheAgent.cpp	2019-09-11 11:07:08 UTC (rev 9600)
@@ -105,17 +105,17 @@
 
 static int mgmapagent_handler (request_rec *r)
 {
-
     if (strcmp(r->handler, "mgmapagent_handler") != 0)  // NOXLATE
     {
         return DECLINED;
     }
 
-    Initialize(r);
     ApacheResponseHandler responseHandler(r);
 
     MG_TRY()
 
+    Initialize(r);
+
     // Construct self Url.  It is embedded into the output stream
     // of some requests (like GetMap).  Use a fully qualified URL.
     string serverName = GetServerVariable(r, MapAgentStrings::ServerName);