com php-src: Merge branch 'PHP-5.6': ext/intl/collator/collator _attr.h main/streams/plain_wrapper.c
| From: | Stanislav Malyshev | Date: | Mon, 01 Dec 2014 01:35:11 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/intl/collator/collator _attr.h main/streams/plain_wrapper.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83404@lists.php.net to get a copy of this message | ||
Commit: b564e7b0de3457c58d3c69faf5b2b0b29b4f1169
Author: Stanislav Malyshev <stas@php.net> Sun, 30 Nov 2014 17:35:11 -0800
Parents: fff70770dd1999d62423f1dbba52fa98a45f01ea aae5d4d9db27a11f9118546fa16c57132704b889
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b564e7b0de3457c58d3c69faf5b2b0b29b4f1169
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
Update NEWS
fix typo
Added test and review suggestion
Fix bug #68335: rmdir doesnt work with file:// stream wrapper
Bugs:
https://bugs.php.net/68335
Changed paths:
MM ext/intl/collator/collator_attr.h
MM main/streams/plain_wrapper.c
Diff:
diff --cc main/streams/plain_wrapper.c
index 8590647,6d8b5c2..40099a1
--- a/main/streams/plain_wrapper.c
+++ b/main/streams/plain_wrapper.c
@@@ -1272,8 -1247,12 +1258,12 @@@ static int php_plain_files_mkdir(php_st
static int php_plain_files_rmdir(php_stream_wrapper *wrapper, const char *url, int options,
php_stream_context *context TSRMLS_DC)
{
+ if (strncasecmp(url, "file://", sizeof("file://") - 1) == 0) {
+ url += sizeof("file://") - 1;
+ }
+
#if PHP_WIN32
- int url_len = strlen(url);
+ int url_len = (int)strlen(url);
#endif
if (php_check_open_basedir(url TSRMLS_CC)) {
return 0;