cellog Mon Apr 28 22:39:54 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/main/streams streams.c
Log:
fix erroneous use of php_resolve_path in _php_stream_wrapper_open_ex - this
breaks require/include for all extensions that intercept zend_resolve_path
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.82.2.6.2.18.2.8&r2=1.82.2.6.2.18.2.9&diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.82.2.6.2.18.2.8
php-src/main/streams/streams.c:1.82.2.6.2.18.2.9
--- php-src/main/streams/streams.c:1.82.2.6.2.18.2.8 Mon Apr 28 22:37:31 2008
+++ php-src/main/streams/streams.c Mon Apr 28 22:39:54 2008
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.82.2.6.2.18.2.8 2008/04/28 22:37:31 cellog Exp $ */
+/* $Id: streams.c,v 1.82.2.6.2.18.2.9 2008/04/28 22:39:54 cellog Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -1771,7 +1771,7 @@
}
if (options & USE_PATH) {
- resolved_path = php_resolve_path(path, strlen(path),
PG(include_path) TSRMLS_CC);
+ resolved_path = zend_resolve_path(path, strlen(path) TSRMLS_CC);
if (resolved_path) {
path = resolved_path;
/* we've found this file, don't re-check include_path
or run realpath */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
