- Compatibility with older libcurl

[m6w6/ext-http] / http_api.c

diff --git a/http_api.c b/http_api.c
index b16da00430999c182e177d656de9da84a0de02f9..f03ac2fb509bc2c1495509406c64074105a25310 100644 (file)
--- a/http_api.c
+++ b/http_api.c
@@ -34,7 +34,6 @@
 #include "ext/standard/php_string.h"
 #include "ext/standard/php_smart_str.h"
 #include "ext/standard/php_lcg.h"
-#include "ext/standard/php_filestat.h"
 
 #include "SAPI.h"
 
@@ -59,6 +58,9 @@
 
 #endif
 
+#if !defined(CURLINFO_RESONSE_CODE) && defined(CURLINFO_HTTP_CODE)
+#define CURLINFO_RESONSE_CODE CURLINFO_HTTP_CODE
+#endif
 
 ZEND_DECLARE_MODULE_GLOBALS(http)
 
@@ -568,8 +570,10 @@ static inline char *_http_curl_getinfoname(CURLINFO i TSRMLS_DC)
        {
                /* CURLINFO_EFFECTIVE_URL                       =       CURLINFO_STRING +1, */
                CASE(EFFECTIVE_URL);
+#ifdef CURLINFO_RESONSE_CODE
                /* CURLINFO_RESPONSE_CODE                       =       CURLINFO_LONG   +2, */
                CASE(RESPONSE_CODE);
+#endif
                /* CURLINFO_TOTAL_TIME                          =       CURLINFO_DOUBLE +3, */
                CASE(TOTAL_TIME);
                /* CURLINFO_NAMELOOKUP_TIME                     =       CURLINFO_DOUBLE +4, */
@@ -610,10 +614,14 @@ static inline char *_http_curl_getinfoname(CURLINFO i TSRMLS_DC)
                CASE(PRIVATE);
                /* CURLINFO_HTTP_CONNECTCODE            =       CURLINFO_LONG   +22, */
                CASE(HTTP_CONNECTCODE);
+#ifdef CURLINFO_HTTPAUTH_AVAIL
                /* CURLINFO_HTTPAUTH_AVAIL                      =       CURLINFO_LONG   +23, */
                CASE(HTTPAUTH_AVAIL);
+#endif
+#ifdef CURLINFO_PROXYAUTH_AVAIL
                /* CURLINFO_PROXYAUTH_AVAIL                     =       CURLINFO_LONG   +24, */
-               CASE(PROXYAUTH_AVAIL);
+               CASE(PROXYAUTH_AVAIL); 
+#endif
        }
 #undef CASE
        return NULL;
@@ -667,8 +675,10 @@ static inline void _http_curl_getinfo(CURL *ch, HashTable *info TSRMLS_DC)
 #define INFO(I) http_curl_getinfo_ex(ch, CURLINFO_ ##I , &array)
        /* CURLINFO_EFFECTIVE_URL                       =       CURLINFO_STRING +1, */
        INFO(EFFECTIVE_URL);
+#ifdef CURLINFO_RESONSE_CODE
        /* CURLINFO_RESPONSE_CODE                       =       CURLINFO_LONG   +2, */
        INFO(RESPONSE_CODE);
+#endif
        /* CURLINFO_TOTAL_TIME                          =       CURLINFO_DOUBLE +3, */
        INFO(TOTAL_TIME);
        /* CURLINFO_NAMELOOKUP_TIME                     =       CURLINFO_DOUBLE +4, */
@@ -709,10 +719,14 @@ static inline void _http_curl_getinfo(CURL *ch, HashTable *info TSRMLS_DC)
        INFO(PRIVATE);
        /* CURLINFO_HTTP_CONNECTCODE            =       CURLINFO_LONG   +22, */
        INFO(HTTP_CONNECTCODE);
+#ifdef CURLINFO_HTTPAUTH_AVAIL
        /* CURLINFO_HTTPAUTH_AVAIL                      =       CURLINFO_LONG   +23, */
        INFO(HTTPAUTH_AVAIL);
+#endif
+#ifdef CURLINFO_PROXYAUTH_AVAIL
        /* CURLINFO_PROXYAUTH_AVAIL                     =       CURLINFO_LONG   +24, */
        INFO(PROXYAUTH_AVAIL);
+#endif
 #undef INFO
 }
 /* }}} */
@@ -1061,9 +1075,12 @@ PHP_HTTP_API inline time_t _http_lmod(const void *data_ptr, const http_send_mode
 
                default:
                {
-                       zval mtime;
-                       php_stat(Z_STRVAL_P((zval *) data_ptr), Z_STRLEN_P((zval *) data_ptr), 6, &mtime TSRMLS_CC);
-                       return Z_LVAL(mtime);
+                       if (!HTTP_G(ssb).sb.st_mtime) {
+                               if(php_stream_stat_path(Z_STRVAL_P((zval *) data_ptr), &HTTP_G(ssb))) {
+                                       return 0;
+                               }
+                       }
+                       return HTTP_G(ssb).sb.st_mtime;
                }
        }
 }