diff options
| author | Anatol Belski <ab@php.net> | 2014-12-01 08:30:59 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-01 08:30:59 +0100 |
| commit | c370683903adf740b330755cfb01cc2da5df7cb0 (patch) | |
| tree | aee7272e6c870f2f144e63c09759935bc7125de0 | |
| parent | bfe7c6988fd128352c3ec6a5b95ac9c1fbb5fe06 (diff) | |
| parent | c1ec815faee2f3d6102c5633fc70fbb06d418379 (diff) | |
| download | php-git-c370683903adf740b330755cfb01cc2da5df7cb0.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
add include for missing usleep proto
C89 compat
Added more useful warning messages
Changed based on comments and make its behaviour equal to the Windows version
Fix #53092 - dns_get_record does not return false on dns server failure
Fix php cli (-S option) inconsistent port parsing
| -rw-r--r-- | main/streams/plain_wrapper.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c index 6d8b5c203d..1726e4f749 100644 --- a/main/streams/plain_wrapper.c +++ b/main/streams/plain_wrapper.c @@ -41,6 +41,7 @@ #include "php_streams_int.h" #ifdef PHP_WIN32 # include "win32/winutil.h" +# include "win32/time.h" #endif #define php_stream_fopen_from_fd_int(fd, mode, persistent_id) _php_stream_fopen_from_fd_int((fd), (mode), (persistent_id) STREAMS_CC TSRMLS_CC) @@ -1251,15 +1252,12 @@ static int php_plain_files_rmdir(php_stream_wrapper *wrapper, const char *url, i url += sizeof("file://") - 1; } -#if PHP_WIN32 - int url_len = strlen(url); -#endif if (php_check_open_basedir(url TSRMLS_CC)) { return 0; } #if PHP_WIN32 - if (!php_win32_check_trailing_space(url, url_len)) { + if (!php_win32_check_trailing_space(url, (int)strlen(url))) { php_error_docref1(NULL TSRMLS_CC, url, E_WARNING, "%s", strerror(ENOENT)); return 0; } |