cvs: php-src(PHP_5_2) /ext/standard http_fopen_wrapper.c /main/streams memory.c

From: Date: Thu, 29 Jun 2006 14:40:49 +0000
Subject: cvs: php-src(PHP_5_2) /ext/standard http_fopen_wrapper.c /main/streams memory.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-38987@lists.php.net to get a copy of this message
bjori Thu Jun 29 14:40:49 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard http_fopen_wrapper.c /php-src/main/streams memory.c Log: url->URL http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http_fopen_wrapper.c?r1=1.99.2.12&r2=1.99.2.12.2.1&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 php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.1 --- php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12 Sun Apr 16 17:40:33 2006 +++ php-src/ext/standard/http_fopen_wrapper.c Thu Jun 29 14:40:49 2006 @@ -19,7 +19,7 @@ | Sara Golemon <pollita@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: http_fopen_wrapper.c,v 1.99.2.12 2006/04/16 17:40:33 iliaa Exp $ */ +/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.1 2006/06/29 14:40:49 bjori Exp $ */ #include "php.h" #include "php_globals.h" @@ -619,7 +619,7 @@ php_url_free(resource); /* check for invalid redirection URLs */ if ((resource = php_url_parse(new_path)) == NULL) { - php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "Invalid redirect url! %s", new_path); + php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "Invalid redirect URL! %s", new_path); goto out; } @@ -631,7 +631,7 @@ s = val; e = s + l; \ while (s < e) { \ if (iscntrl(*s)) { \ - php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "Invalid redirect url! %s", new_path); \ + php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "Invalid redirect URL! %s", new_path); \ goto out; \ } \ s++; \ http://cvs.php.net/viewvc.cgi/php-src/main/streams/memory.c?r1=1.8.2.6.2.7&r2=1.8.2.6.2.8&diff_format=u Index: php-src/main/streams/memory.c diff -u php-src/main/streams/memory.c:1.8.2.6.2.7 php-src/main/streams/memory.c:1.8.2.6.2.8 --- php-src/main/streams/memory.c:1.8.2.6.2.7 Tue Jun 6 14:09:12 2006 +++ php-src/main/streams/memory.c Thu Jun 29 14:40:49 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: memory.c,v 1.8.2.6.2.7 2006/06/06 14:09:12 tony2001 Exp $ */ +/* $Id: memory.c,v 1.8.2.6.2.8 2006/06/29 14:40:49 bjori Exp $ */ #define _GNU_SOURCE #include "php.h" @@ -584,7 +584,7 @@ } if ((comma = memchr(path, ',', dlen)) == NULL) { - php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "rfc2397: no comma in url"); + php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "rfc2397: no comma in URL"); return NULL; } @@ -645,7 +645,7 @@ } if (mlen) { zval_ptr_dtor(&meta); - php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "rfc2397: illegal url"); + php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "rfc2397: illegal URL"); return NULL; } } else {

« previous php.cvs (#38987) next »