tony2001 Sun Jan 15 22:01:47 2006 UTC
Modified files: (Branch: PHP_4_4)
/php-src NEWS
/php-src/ext/standard http_fopen_wrapper.c
Log:
fix bug #36017 (fopen() crashes PHP when opening a URL)
+ fix incosistency in macro usage
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.1247.2.920.2.111&r2=1.1247.2.920.2.112&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.111 php-src/NEWS:1.1247.2.920.2.112
--- php-src/NEWS:1.1247.2.920.2.111 Sun Jan 15 16:52:10 2006
+++ php-src/NEWS Sun Jan 15 22:01:47 2006
@@ -2,7 +2,8 @@
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2006, Version 4.4.3
- Added a check for special characters in the session name. (Ilia)
-
+- Fixed bug #36017 (fopen() crashes PHP when opening a URL). (Tony)
+
13 Jan 2006, Version 4.4.2
- Added missing safe_mode/open_basedir checks into cURL extension. (Ilia)
- Backported missing imap_mailcompose() fixes from PHP 5.x. (Ilia)
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/http_fopen_wrapper.c?r1=1.53.2.20.2.5&r2=1.53.2.20.2.6&diff_format=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.53.2.20.2.5
php-src/ext/standard/http_fopen_wrapper.c:1.53.2.20.2.6
--- php-src/ext/standard/http_fopen_wrapper.c:1.53.2.20.2.5 Sun Jan 1
13:46:57 2006
+++ php-src/ext/standard/http_fopen_wrapper.c Sun Jan 15 22:01:47 2006
@@ -18,7 +18,7 @@
| Wez Furlong <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: http_fopen_wrapper.c,v 1.53.2.20.2.5 2006/01/01 13:46:57 sniper Exp $
*/
+/* $Id: http_fopen_wrapper.c,v 1.53.2.20.2.6 2006/01/15 22:01:47 tony2001 Exp
$ */
#include "php.h"
#include "php_globals.h"
@@ -339,7 +339,7 @@
size_t tmp_line_len;
/* get response header */
- if (_php_stream_get_line(stream, tmp_line, sizeof(tmp_line) -
1, &tmp_line_len TSRMLS_CC) != NULL) {
+ if (php_stream_get_line(stream, tmp_line, sizeof(tmp_line) - 1,
&tmp_line_len) != NULL) {
zval *http_response;
int response_code;
@@ -394,7 +394,7 @@
while (!body && !php_stream_eof(stream)) {
size_t http_header_line_length;
- if (php_stream_get_line(stream, http_header_line,
HTTP_HEADER_BLOCK_SIZE, &http_header_line_length TSRMLS_CC) &&
*http_header_line != '\n' && *http_header_line != '\r') {
+ if (php_stream_get_line(stream, http_header_line,
HTTP_HEADER_BLOCK_SIZE, &http_header_line_length) && *http_header_line != '\n'
&& *http_header_line != '\r') {
char *e = http_header_line + http_header_line_length -
1;
while (*e == '\n' || *e == '\r') {
e--;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
