cvs: php-src(PHP_5_2) /ext/curl interface.c /ext/standard url.c

From: Date: Thu, 29 Jun 2006 14:31:57 +0000
Subject: cvs: php-src(PHP_5_2) /ext/curl interface.c /ext/standard url.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-38985@lists.php.net to get a copy of this message
bjori Thu Jun 29 14:31:57 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard url.c /php-src/ext/curl interface.c Log: Bug #37961 (url should be URL) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/url.c?r1=1.86.2.5.2.1&r2=1.86.2.5.2.2&diff_format=u Index: php-src/ext/standard/url.c diff -u php-src/ext/standard/url.c:1.86.2.5.2.1 php-src/ext/standard/url.c:1.86.2.5.2.2 --- php-src/ext/standard/url.c:1.86.2.5.2.1 Mon Jun 26 18:48:56 2006 +++ php-src/ext/standard/url.c Thu Jun 29 14:31:56 2006 @@ -15,7 +15,7 @@ | Author: Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: url.c,v 1.86.2.5.2.1 2006/06/26 18:48:56 bjori Exp $ */ +/* $Id: url.c,v 1.86.2.5.2.2 2006/06/29 14:31:56 bjori Exp $ */ #include <stdlib.h> #include <string.h> @@ -344,7 +344,7 @@ resource = php_url_parse_ex(str, str_len); if (resource == NULL) { - php_error_docref1(NULL TSRMLS_CC, str, E_WARNING, "Unable to parse url"); + php_error_docref1(NULL TSRMLS_CC, str, E_WARNING, "Unable to parse URL"); RETURN_FALSE; } @@ -375,7 +375,7 @@ if (resource->fragment != NULL) RETVAL_STRING(resource->fragment, 1); break; default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid url component identifier %ld.", key); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid URL component identifier %ld.", key); RETVAL_FALSE; } goto done; http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.4&r2=1.62.2.14.2.5&diff_format=u Index: php-src/ext/curl/interface.c diff -u php-src/ext/curl/interface.c:1.62.2.14.2.4 php-src/ext/curl/interface.c:1.62.2.14.2.5 --- php-src/ext/curl/interface.c:1.62.2.14.2.4 Mon Jun 26 14:11:17 2006 +++ php-src/ext/curl/interface.c Thu Jun 29 14:31:56 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interface.c,v 1.62.2.14.2.4 2006/06/26 14:11:17 bjori Exp $ */ +/* $Id: interface.c,v 1.62.2.14.2.5 2006/06/29 14:31:56 bjori Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -163,12 +163,12 @@ php_url *tmp_url; \ \ if (!(tmp_url = php_url_parse_ex(str, len))) { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid url '%s'", str); \ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid URL '%s'", str); \ RETURN_FALSE; \ } \ \ if (php_memnstr(str, tmp_url->path, strlen(tmp_url->path), str + len)) { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Url '%s' contains unencoded control characters.", str); \ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "URL '%s' contains unencoded control characters.", str); \ RETURN_FALSE; \ } \ \

« previous php.cvs (#38985) next »