svn: /php/php-src/trunk/ext/standard/ php_fopen_wrapper.c
| From: | Jani Taskinen | Date: | Thu, 20 Aug 2009 12:19:49 +0000 |
| Subject: | svn: /php/php-src/trunk/ext/standard/ php_fopen_wrapper.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-60194@lists.php.net to get a copy of this message | ||
jani Thu, 20 Aug 2009 12:19:49 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=287506
Log:
- Merge missing commit by Ilia from PHP_5_3: Make filters without a resource throw
E_RECOVERABLE_ERROR rather then E_ERROR
Changed paths:
U php/php-src/trunk/ext/standard/php_fopen_wrapper.c
Modified: php/php-src/trunk/ext/standard/php_fopen_wrapper.c
===================================================================
--- php/php-src/trunk/ext/standard/php_fopen_wrapper.c 2009-08-20 12:17:32 UTC (rev 287505)
+++ php/php-src/trunk/ext/standard/php_fopen_wrapper.c 2009-08-20 12:19:49 UTC (rev 287506)
@@ -269,7 +269,7 @@
pathdup = estrndup(path + 6, strlen(path + 6));
p = strstr(pathdup, "/resource=");
if (!p) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "No URL resource specified");
+ php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, "No URL resource specified");
efree(pathdup);
return NULL;
}