pollita         Mon Nov  5 01:00:44 2007 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/standard       http_fopen_wrapper.c 
    /php-src    NEWS 
  Log:
  MFH: http/ignore_errors context option
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http_fopen_wrapper.c?r1=1.99.2.12.2.9.2.1&r2=1.99.2.12.2.9.2.2&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.1 
php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.9.2.2
--- php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.9.2.1 Sun Sep 30 
05:49:45 2007
+++ php-src/ext/standard/http_fopen_wrapper.c   Mon Nov  5 01:00:43 2007
@@ -19,7 +19,7 @@
    |          Sara Golemon <[EMAIL PROTECTED]>                              |
    +----------------------------------------------------------------------+
  */
-/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.9.2.1 2007/09/30 05:49:45 jani Exp 
$ */ 
+/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.9.2.2 2007/11/05 01:00:43 pollita 
Exp $ */ 
 
 #include "php.h"
 #include "php_globals.h"
@@ -501,7 +501,8 @@
                                response_code = 0;
                        }
                        /* when we request only the header, don't fail even on 
error codes */
-                       if (options & STREAM_ONLY_GET_HEADERS) {
+                       if ((options & STREAM_ONLY_GET_HEADERS) ||
+                               (php_stream_context_get_option(context, "http", 
"ignore_errors",  &tmpzval) == SUCCESS && zend_is_true(*tmpzval)) ) {
                                reqok = 1;
                        }
                        switch(response_code) {
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.40&r2=1.2027.2.547.2.965.2.41&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.40 
php-src/NEWS:1.2027.2.547.2.965.2.41
--- php-src/NEWS:1.2027.2.547.2.965.2.40        Sat Nov  3 20:56:58 2007
+++ php-src/NEWS        Mon Nov  5 01:00:43 2007
@@ -22,6 +22,7 @@
   (Etienne Kneuss)
 - Added "compact" handler for Zend MM storage. (Dmitry)
 - Added '+' and '*' specifiers to zend_parse_parameters(). (Andrei)
+- Added 'ignore_errors' option to http fopen wrapper. (David Zulke, Sara)
 
 - Upgraded PCRE to version 7.4 (Nuno)
 

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

Reply via email to