summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Beaver <cellog@php.net>2008-04-28 22:39:54 +0000
committerGreg Beaver <cellog@php.net>2008-04-28 22:39:54 +0000
commitcac1fd72ea6d334d0b1877b4ecbed8b1bed947f5 (patch)
treeedf9151192d58a70cbb84aafdd6c6e9c349d95c0
parentc46d651b3e008e189f351217b8084abaa3a9bda6 (diff)
downloadphp-git-cac1fd72ea6d334d0b1877b4ecbed8b1bed947f5.tar.gz
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
-rwxr-xr-xmain/streams/streams.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/streams/streams.c b/main/streams/streams.c
index 3a40e33267..bd14748b28 100755
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
@@ -1771,7 +1771,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 */