summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-12-01 08:32:12 +0100
committerAnatol Belski <ab@php.net>2014-12-01 08:32:12 +0100
commit49de5b7aed4bed9ebbb4bc085d240084b090ad7b (patch)
tree0d3c858124797f91a61fbe9e22636817823edb2c
parenta41412cdf03dc191c6fa1c31e56d5ff5e317abe4 (diff)
parentc370683903adf740b330755cfb01cc2da5df7cb0 (diff)
downloadphp-git-49de5b7aed4bed9ebbb4bc085d240084b090ad7b.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: 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 Conflicts: main/streams/plain_wrapper.c
-rw-r--r--main/streams/plain_wrapper.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c
index 40099a1700..8fad2aa4f1 100644
--- a/main/streams/plain_wrapper.c
+++ b/main/streams/plain_wrapper.c
@@ -1262,15 +1262,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 = (int)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;
}