derick Thu Nov 29 12:27:49 2007 UTC
Added files:
/php-src/ext/standard/tests/network http-stream.phpt
Modified files:
/php-src/ext/standard http_fopen_wrapper.c
Log:
- Fixed a segfault when reading from an HTTP stream.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http_fopen_wrapper.c?r1=1.129&r2=1.130&diff_format=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.129
php-src/ext/standard/http_fopen_wrapper.c:1.130
--- php-src/ext/standard/http_fopen_wrapper.c:1.129 Mon Nov 5 00:47:21 2007
+++ php-src/ext/standard/http_fopen_wrapper.c Thu Nov 29 12:27:49 2007
@@ -19,7 +19,7 @@
| Sara Golemon <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: http_fopen_wrapper.c,v 1.129 2007/11/05 00:47:21 pollita Exp $ */
+/* $Id: http_fopen_wrapper.c,v 1.130 2007/11/29 12:27:49 derick Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -545,7 +545,7 @@
}
/* when we request only the header, don't fail even on
error codes */
if ((options & STREAM_ONLY_GET_HEADERS) ||
- (php_stream_context_get_option(context, "http",
"ignore_errors", &tmpzval) == SUCCESS && zend_is_true(*tmpzval)) ) {
+ (context &&
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/ext/standard/tests/network/http-stream.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/network/http-stream.phpt
+++ php-src/ext/standard/tests/network/http-stream.phpt
--TEST--
http-stream test
--FILE--
<?php
$d = new DomDocument;
$e = $d->load("http://php.net/news.rss";);
echo "ALIVE\n";
?>
--EXPECTF--
ALIVE
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
