[mapserver-commits] r9708 - trunk/mapserver

[svn at osgeo.org]

Author: aboudreault
Date: 2010-01-18 13:22:36 -0500 (Mon, 18 Jan 2010)
New Revision: 9708

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/configure
   trunk/mapserver/configure.in
   trunk/mapserver/maphttp.c
Log:
Fixed curl proxy auth support for http connections (#571)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2010-01-18 17:47:01 UTC (rev 9707)
+++ trunk/mapserver/HISTORY.TXT	2010-01-18 18:22:36 UTC (rev 9708)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Fixed curl proxy auth support for http connections (#571)
+
 - PHP/MapScript: removed deprecated class properties (#2170)
 
 - Fixed OGR datasource double free (#3261)

Modified: trunk/mapserver/configure
===================================================================
--- trunk/mapserver/configure	2010-01-18 17:47:01 UTC (rev 9707)
+++ trunk/mapserver/configure	2010-01-18 18:22:36 UTC (rev 9708)
@@ -11917,6 +11917,7 @@
 
   CURL_VERNUM=`$LIBCURL_CONFIG --vernum`
   CURL_VER=`$LIBCURL_CONFIG --version | awk '{print $2}'`
+  CURL_FLAGS=""
 
   echo "$as_me:$LINENO: result:         found libcurl version $CURL_VER" >&5
 echo "${ECHO_T}        found libcurl version $CURL_VER" >&6
@@ -11927,6 +11928,17 @@
    { (exit 1); exit 1; }; }
   fi
 
+    echo "$as_me:$LINENO: checking for CURLOPT_PROXYAUTH support" >&5
+echo $ECHO_N "checking for CURLOPT_PROXYAUTH support... $ECHO_C" >&6
+  if test -z "$CURL_VERNUM" -o `expr "0x$CURL_VERNUM" \>= "0x070a07"` = 1; then
+    echo "$as_me:$LINENO: result: yes." >&5
+echo "${ECHO_T}yes." >&6
+    CURL_FLAGS="-DUSE_CURLOPT_PROXYAUTH"
+  else
+    echo "$as_me:$LINENO: result: no." >&5
+echo "${ECHO_T}no." >&6
+  fi
+
       if test "$WMS_REQUESTED" = "yes" ; then
     WMS_LYR_ENABLED="-DUSE_WMS_LYR"
     echo "$as_me:$LINENO: result:         OGC WMS Client Connections enabled ($WMS_LYR_ENABLED)." >&5
@@ -11941,7 +11953,7 @@
 
   CURL_INC=`$LIBCURL_CONFIG --cflags`
   CURL_LIB=`$LIBCURL_CONFIG --libs`
-  CURL_ENABLED=-DUSE_CURL
+  CURL_ENABLED="-DUSE_CURL $CURL_FLAGS"
 
 fi
 

Modified: trunk/mapserver/configure.in
===================================================================
--- trunk/mapserver/configure.in	2010-01-18 17:47:01 UTC (rev 9707)
+++ trunk/mapserver/configure.in	2010-01-18 18:22:36 UTC (rev 9708)
@@ -1923,6 +1923,7 @@
 
   CURL_VERNUM=`$LIBCURL_CONFIG --vernum`
   CURL_VER=`$LIBCURL_CONFIG --version | awk '{print $2}'`
+  CURL_FLAGS=""
 
   AC_MSG_RESULT([        found libcurl version $CURL_VER])
   
@@ -1931,6 +1932,15 @@
     AC_MSG_ERROR([libcurl version 7.10.1 or more recent is required.])
   fi
 
+  dnl Verify if the the PROXYAUTH support is avaible (>= 7.10.7)
+  AC_MSG_CHECKING(for CURLOPT_PROXYAUTH support)
+  if test -z "$CURL_VERNUM" -o `expr "0x$CURL_VERNUM" \>= "0x070a07"` = 1; then
+    AC_MSG_RESULT([yes.])
+    CURL_FLAGS="-DUSE_CURLOPT_PROXYAUTH"
+  else
+    AC_MSG_RESULT([no.])
+  fi
+
   dnl set WMS_LYR_ENABLED/WFS_LYR_ENABLED here, Makefile substitutions are
   dnl done only further down, after checking for libxml2
   if test "$WMS_REQUESTED" = "yes" ; then
@@ -1945,7 +1955,7 @@
 
   CURL_INC=`$LIBCURL_CONFIG --cflags`
   CURL_LIB=`$LIBCURL_CONFIG --libs`
-  CURL_ENABLED=-DUSE_CURL
+  CURL_ENABLED="-DUSE_CURL $CURL_FLAGS"
 
 fi
 

Modified: trunk/mapserver/maphttp.c
===================================================================
--- trunk/mapserver/maphttp.c	2010-01-18 17:47:01 UTC (rev 9707)
+++ trunk/mapserver/maphttp.c	2010-01-18 18:22:36 UTC (rev 9708)
@@ -442,7 +442,7 @@
                 && strlen(pasReqInfo[i].pszProxyPassword) > 0)
             {
                 char    szUsernamePasswd[128];    
-#ifdef CURLOPT_PROXYAUTH
+#ifdef USE_CURLOPT_PROXYAUTH
                 long    nProxyAuthType = CURLAUTH_BASIC;
                 /* CURLOPT_PROXYAUTH available only in Curl 7.10.7 and up */
                 nProxyAuthType = msGetCURLAuthType(pasReqInfo[i].eProxyAuthType);