cellog Mon Apr 28 22:40:10 2008 UTC
Modified files:
/php-src/main/streams streams.c
Log:
MFB: 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.162&r2=1.163&diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.162
php-src/main/streams/streams.c:1.163
--- php-src/main/streams/streams.c:1.162 Mon Apr 28 22:37:45 2008
+++ php-src/main/streams/streams.c Mon Apr 28 22:40:10 2008
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.162 2008/04/28 22:37:45 cellog Exp $ */
+/* $Id: streams.c,v 1.163 2008/04/28 22:40:10 cellog Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -2374,7 +2374,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
