archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-5.5' into PHP-5.6

Browse source 
* 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
This commit is contained in:
Anatol Belski 2014-12-01 08:30:59 +01:00
commit c370683903
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
main/streams/plain_wrapper.c
View file

@ -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;
}