mike            Fri Jul 25 08:27:38 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src    NEWS 
    /php-src/ext/standard       http_fopen_wrapper.c 
  Log:
  - Changed HTTP stream wrapper to accept any code between and including
    200 to 399 as successful. (patch by Noah Fontes)
  
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.221&r2=1.2027.2.547.2.965.2.222&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.221 
php-src/NEWS:1.2027.2.547.2.965.2.222
--- php-src/NEWS:1.2027.2.547.2.965.2.221       Fri Jul 25 04:54:08 2008
+++ php-src/NEWS        Fri Jul 25 08:27:37 2008
@@ -16,6 +16,8 @@
 - Changed PCRE, SPL and reflection extensions to always be enabled. (Marcus)
 - Changed md5() to use improved implementation. (Solar Designer, Dmitry)
 - Changed mhash to be a wrapper layer around the hash extension. (Scott)
+- Changed HTTP stream wrapper to accept any code between and including
+  200 to 399 as successful. (Mike, Noah Fontes)
 
 - Improved PHP syntax and semantics:
   . Added lambda functions and closures (Christian Seiler, Dmitry)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http_fopen_wrapper.c?r1=1.99.2.12.2.9.2.8&r2=1.99.2.12.2.9.2.9&diff_format=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.9.2.8 
php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.9.2.9
--- php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.9.2.8 Fri Jul 11 
10:25:15 2008
+++ php-src/ext/standard/http_fopen_wrapper.c   Fri Jul 25 08:27:37 2008
@@ -19,7 +19,7 @@
    |          Sara Golemon <[EMAIL PROTECTED]>                              |
    +----------------------------------------------------------------------+
  */
-/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.9.2.8 2008/07/11 10:25:15 tony2001 
Exp $ */ 
+/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.9.2.9 2008/07/25 08:27:37 mike Exp 
$ */ 
 
 #include "php.h"
 #include "php_globals.h"
@@ -529,25 +529,25 @@
                                (context && 
php_stream_context_get_option(context, "http", "ignore_errors",  &tmpzval) == 
SUCCESS && zend_is_true(*tmpzval)) ) {
                                reqok = 1;
                        }
-                       switch(response_code) {
-                               case 200:
-                               case 206: /* partial content */
-                               case 302:
-                               case 303:
-                               case 301:
-                                       reqok = 1;
-                                       break;
-                               case 403:
-                                       php_stream_notify_error(context, 
PHP_STREAM_NOTIFY_AUTH_RESULT,
-                                                       tmp_line, 
response_code);
-                                       break;
-                               default:
-                                       /* safety net in the event tmp_line == 
NULL */
-                                       if (!tmp_line_len) {
-                                               tmp_line[0] = '\0';
-                                       }
-                                       php_stream_notify_error(context, 
PHP_STREAM_NOTIFY_FAILURE,
-                                                       tmp_line, 
response_code);
+                       /* all status codes in the 2xx range are defined by the 
specification as successful;
+                        * all status codes in the 3xx range are for 
redirection, and so also should never
+                        * fail */
+                       if (response_code >= 200 && response_code < 400) {
+                               reqok = 1;
+                       } else {
+                               switch(response_code) {
+                                       case 403:
+                                               
php_stream_notify_error(context, PHP_STREAM_NOTIFY_AUTH_RESULT,
+                                                               tmp_line, 
response_code);
+                                               break;
+                                       default:
+                                               /* safety net in the event 
tmp_line == NULL */
+                                               if (!tmp_line_len) {
+                                                       tmp_line[0] = '\0';
+                                               }
+                                               
php_stream_notify_error(context, PHP_STREAM_NOTIFY_FAILURE,
+                                                               tmp_line, 
response_code);
+                               }
                        }
                        if (tmp_line[tmp_line_len - 1] == '\n') {
                                --tmp_line_len;



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

Reply via email to