srinatar                                 Thu, 24 Sep 2009 18:45:09 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=288678

Log:
- Rollback fix for bug #49571 (CURLOPT_POSTREDIR not implemented).
# - Features don't go into PHP 5.2

Bug: http://bugs.php.net/49571 (To be documented) CURLOPT_POSTREDIR not 
implemented
      
Changed paths:
    U   php/php-src/branches/PHP_5_2/NEWS
    U   php/php-src/branches/PHP_5_2/ext/curl/interface.c

Modified: php/php-src/branches/PHP_5_2/NEWS
===================================================================
--- php/php-src/branches/PHP_5_2/NEWS   2009-09-24 18:20:49 UTC (rev 288677)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-09-24 18:45:09 UTC (rev 288678)
@@ -12,8 +12,6 @@
   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.

Modified: php/php-src/branches/PHP_5_2/ext/curl/interface.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/curl/interface.c   2009-09-24 18:20:49 UTC 
(rev 288677)
+++ php/php-src/branches/PHP_5_2/ext/curl/interface.c   2009-09-24 18:45:09 UTC 
(rev 288678)
@@ -649,10 +649,6 @@
        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 @@
                        }
                        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:

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to