Fix build with curl < 7.26
authorRemi Collet <remi@php.net>
Thu, 25 Sep 2014 08:16:51 +0000 (10:16 +0200)
committerRemi Collet <remi@php.net>
Thu, 25 Sep 2014 08:16:51 +0000 (10:16 +0200)
$ grep  "define CURL_REDIR_POST_30" curl-7.2*/include/curl/curl.h

curl-7.25.0/include/curl/curl.h:#define CURL_REDIR_POST_301 1
curl-7.25.0/include/curl/curl.h:#define CURL_REDIR_POST_302 2

curl-7.26.0/include/curl/curl.h:#define CURL_REDIR_POST_301 1
curl-7.26.0/include/curl/curl.h:#define CURL_REDIR_POST_302 2
curl-7.26.0/include/curl/curl.h:#define CURL_REDIR_POST_303 4

php_http_client_curl.c

index 6f9884ef87feff5eb4be102157f274c2b46f9c7e..8f252119493dcd8c3256328d8060ffbf7ccefc24 100644 (file)
@@ -2169,7 +2169,9 @@ PHP_MINIT_FUNCTION(http_client_curl)
 #if PHP_HTTP_CURL_VERSION(7,19,1)
        REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "POSTREDIR_301", CURL_REDIR_POST_301, CONST_CS|CONST_PERSISTENT);
        REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "POSTREDIR_302", CURL_REDIR_POST_302, CONST_CS|CONST_PERSISTENT);
 #if PHP_HTTP_CURL_VERSION(7,19,1)
        REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "POSTREDIR_301", CURL_REDIR_POST_301, CONST_CS|CONST_PERSISTENT);
        REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "POSTREDIR_302", CURL_REDIR_POST_302, CONST_CS|CONST_PERSISTENT);
+#if PHP_HTTP_CURL_VERSION(7,26,0)
        REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "POSTREDIR_303", CURL_REDIR_POST_303, CONST_CS|CONST_PERSISTENT);
        REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "POSTREDIR_303", CURL_REDIR_POST_303, CONST_CS|CONST_PERSISTENT);
+#endif
        REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "POSTREDIR_ALL", CURL_REDIR_POST_ALL, CONST_CS|CONST_PERSISTENT);
 #endif
 
        REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "POSTREDIR_ALL", CURL_REDIR_POST_ALL, CONST_CS|CONST_PERSISTENT);
 #endif