diff options
| author | Greg Beaver <cellog@php.net> | 2008-01-12 15:50:57 +0000 |
|---|---|---|
| committer | Greg Beaver <cellog@php.net> | 2008-01-12 15:50:57 +0000 |
| commit | 7c1952c8637d66758d7fa3ffc55e93afca31636d (patch) | |
| tree | 97475b0debbfdc48cceeafedf8d9c70f1a849bec /main/streams/streams.c | |
| parent | f76eac59c025250aac658f375f6e69858e81668e (diff) | |
| download | php-git-7c1952c8637d66758d7fa3ffc55e93afca31636d.tar.gz | |
MFH: clarify error message on why opening a stream wrapper failed for allow_url_include/allow_url_fopen, add test for allow_url_fopen
Diffstat (limited to 'main/streams/streams.c')
| -rwxr-xr-x | main/streams/streams.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/main/streams/streams.c b/main/streams/streams.c index 366cc40183..5167a71606 100755 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -1628,7 +1628,11 @@ PHPAPI php_stream_wrapper *php_stream_locate_url_wrapper(const char *path, char if (options & REPORT_ERRORS) { /* protocol[n] probably isn't '\0' */ char *protocol_dup = estrndup(protocol, n); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s:// wrapper is disabled in the server configuration", protocol_dup); + if (!PG(allow_url_fopen)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s:// wrapper is disabled in the server configuration by allow_url_fopen=0", protocol_dup); + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s:// wrapper is disabled in the server configuration by allow_url_include=0", protocol_dup); + } efree(protocol_dup); } return NULL; |