From 2b41209dfb40d63057c5727b20b345df7d7b7d34 Mon Sep 17 00:00:00 2001 From: Greg Beaver Date: Mon, 28 Apr 2008 22:40:10 +0000 Subject: [PATCH] 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 --- main/streams/streams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/streams/streams.c b/main/streams/streams.c index d81996de0d..91c7a6a960 100755 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -2374,7 +2374,7 @@ PHPAPI php_stream *_php_stream_open_wrapper_ex(char *path, char *mode, int optio } 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 */ -- 2.50.1