[PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard http_fopen_wrapper.c
sniper Wed Feb 25 08:20:37 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard http_fopen_wrapper.c
Log:
MFH: ZTS build fix
http://cvs.php.net/diff.php/php-src/ext/standard/http_fopen_wrapper.c?r1=1.53.2.15r2=1.53.2.16ty=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.53.2.15
php-src/ext/standard/http_fopen_wrapper.c:1.53.2.16
--- php-src/ext/standard/http_fopen_wrapper.c:1.53.2.15 Tue Feb 24 16:53:56 2004
+++ php-src/ext/standard/http_fopen_wrapper.c Wed Feb 25 08:20:31 2004
@@ -18,7 +18,7 @@
| Wez Furlong [EMAIL PROTECTED] |
+--+
*/
-/* $Id: http_fopen_wrapper.c,v 1.53.2.15 2004/02/24 21:53:56 iliaa Exp $ */
+/* $Id: http_fopen_wrapper.c,v 1.53.2.16 2004/02/25 13:20:31 sniper Exp $ */
#include php.h
#include php_globals.h
@@ -343,7 +343,7 @@
size_t tmp_line_len;
/* get response header */
- if (_php_stream_get_line(stream, tmp_line, sizeof(tmp_line) - 1,
tmp_line_len) != NULL) {
+ if (_php_stream_get_line(stream, tmp_line, sizeof(tmp_line) - 1,
tmp_line_len TSRMLS_CC) != NULL) {
zval *http_response;
int response_code;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard http_fopen_wrapper.c
iliaa Wed Feb 25 19:03:58 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard http_fopen_wrapper.c
Log:
MFH: Handle situation where feof() occurs before the HTTP header is
retrieved.
http://cvs.php.net/diff.php/php-src/ext/standard/http_fopen_wrapper.c?r1=1.53.2.16r2=1.53.2.17ty=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.53.2.16
php-src/ext/standard/http_fopen_wrapper.c:1.53.2.17
--- php-src/ext/standard/http_fopen_wrapper.c:1.53.2.16 Wed Feb 25 08:20:31 2004
+++ php-src/ext/standard/http_fopen_wrapper.c Wed Feb 25 19:03:57 2004
@@ -18,7 +18,7 @@
| Wez Furlong [EMAIL PROTECTED] |
+--+
*/
-/* $Id: http_fopen_wrapper.c,v 1.53.2.16 2004/02/25 13:20:31 sniper Exp $ */
+/* $Id: http_fopen_wrapper.c,v 1.53.2.17 2004/02/26 00:03:57 iliaa Exp $ */
#include php.h
#include php_globals.h
@@ -387,6 +387,9 @@
Z_TYPE_P(http_response) = IS_STRING;
zend_hash_next_index_insert(Z_ARRVAL_PP(response_header),
http_response, sizeof(zval *), NULL);
}
+ } else {
+ php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, HTTP request
failed, unexpected end of socket.!);
+ goto out;
}
/* read past HTTP headers */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard http_fopen_wrapper.c
sniper Wed Feb 25 19:13:04 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard http_fopen_wrapper.c
Log:
typofix
http://cvs.php.net/diff.php/php-src/ext/standard/http_fopen_wrapper.c?r1=1.53.2.17r2=1.53.2.18ty=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.53.2.17
php-src/ext/standard/http_fopen_wrapper.c:1.53.2.18
--- php-src/ext/standard/http_fopen_wrapper.c:1.53.2.17 Wed Feb 25 19:03:57 2004
+++ php-src/ext/standard/http_fopen_wrapper.c Wed Feb 25 19:13:02 2004
@@ -18,7 +18,7 @@
| Wez Furlong [EMAIL PROTECTED] |
+--+
*/
-/* $Id: http_fopen_wrapper.c,v 1.53.2.17 2004/02/26 00:03:57 iliaa Exp $ */
+/* $Id: http_fopen_wrapper.c,v 1.53.2.18 2004/02/26 00:13:02 sniper Exp $ */
#include php.h
#include php_globals.h
@@ -388,7 +388,7 @@
zend_hash_next_index_insert(Z_ARRVAL_PP(response_header),
http_response, sizeof(zval *), NULL);
}
} else {
- php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, HTTP request
failed, unexpected end of socket.!);
+ php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, HTTP request
failed, unexpected end of socket!);
goto out;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
