- Rollback fix for bug #49571 (CURLOPT_POSTREDIR not implemented).

# - Features don't go into PHP 5.2

diff --git a/NEWS b/NEWS
index 23a232b982424a86a42d96946c7c3934534d608d..7910e93fa0237642aec7b87c73a396a92910a859 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -12,8 +12,6 @@ PHP                                                                        NEWS
   of a multibyte character). (Moriyoshi)
 - Fixed bug #49528 (UTF-16 strings prefixed by BOMs wrondly converted).
   (Moriyoshi)
-- Fixed bug #49571 (CURLOPT_POSTREDIR not implemented).
-  (Sriram Natarajan)
 
 17 Sep 2009, PHP 5.2.11
 - Fixed certificate validation inside php_openssl_apply_verification_policy.

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index d322f72b514d0d8aa63ab3c0dae2e33b85afe7ed..f5b4c51de843f1ec4838e93ac7078bf7175c3cd9 100644 (file)
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -649,10 +649,6 @@ PHP_MINIT_FUNCTION(curl)
        REGISTER_CURL_CONSTANT(CURLFTPSSL_ALL);
 #endif
 
-#if LIBCURL_VERSION_NUM > 0x071301
-       REGISTER_CURL_CONSTANT(CURLOPT_POSTREDIR);
-#endif
-
 #if LIBCURL_VERSION_NUM >= 0x071304
        REGISTER_CURL_CONSTANT(CURLOPT_REDIR_PROTOCOLS);
        REGISTER_CURL_CONSTANT(CURLOPT_PROTOCOLS);
@@ -1385,12 +1381,6 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
                        }
                        error = curl_easy_setopt(ch->cp, option, Z_LVAL_PP(zvalue));
                        break;
-#if LIBCURL_VERSION_NUM > 0x071301
-               case CURLOPT_POSTREDIR:
-                       convert_to_long_ex(zvalue);
-                       error = curl_easy_setopt(ch->cp, CURLOPT_POSTREDIR, Z_LVAL_PP(zvalue) & CURL_REDIR_POST_ALL);
-                       break;
-#endif
                case CURLOPT_PRIVATE:
                case CURLOPT_URL:
                case CURLOPT_PROXY: