Browse Source

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

PECL
Greg Beaver 19 years ago
parent
commit
cac1fd72ea
  1. 2
      main/streams/streams.c

2
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) { 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) { if (resolved_path) {
path = resolved_path; path = resolved_path;
/* we've found this file, don't re-check include_path or run realpath */ /* we've found this file, don't re-check include_path or run realpath */

Loading…
Cancel
Save