[mapserver-commits] r7582 - trunk/mapserver

[svn at osgeo.org]

Author: dmorissette
Date: 2008-05-12 15:43:09 -0400 (Mon, 12 May 2008)
New Revision: 7582

Modified:
   trunk/mapserver/maphttp.c
Log:
Call msHTTPInit() only if really required (#2615)

Modified: trunk/mapserver/maphttp.c
===================================================================
--- trunk/mapserver/maphttp.c	2008-05-12 19:22:30 UTC (rev 7581)
+++ trunk/mapserver/maphttp.c	2008-05-12 19:43:09 UTC (rev 7582)
@@ -121,9 +121,7 @@
 void msHTTPInitRequestObj(httpRequestObj *pasReqInfo, int numRequests) 
 {
     int i;
-    if (!gbCurlInitialized)
-        msHTTPInit();
-  
+
     for(i=0; i<numRequests; i++)
     {
         pasReqInfo[i].pszGetUrl = NULL;
@@ -244,6 +242,9 @@
     if (numRequests == 0)
         return MS_SUCCESS;  /* Nothing to do */
 
+    if (!gbCurlInitialized)
+        msHTTPInit();
+  
     /* Establish the timeout (seconds) for how long we are going to wait 
      * for a response. 
      * We use the longest timeout value in the array of requests