com php-src: Merge branch 'PHP-5.6': sapi/cli/php_cli_serve r.c
| From: | Christoph Michael Becker | Date: | Sat, 05 Sep 2015 12:43:19 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': sapi/cli/php_cli_serve r.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88926@lists.php.net to get a copy of this message | ||
Commit: cc9da62bdb815421151958e8f2971d992291192a
Author: Christoph M. Becker <cmb@php.net> Sat, 5 Sep 2015 14:43:19 +0200
Parents: 403974f4dc762cf0c5f1ac09009fff13543e099c aed225b7e4d711d7c2cbf45f59e5f66929debb94
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cc9da62bdb815421151958e8f2971d992291192a
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix #68291: 404 on urls with '+'
Resolved conflicts:
sapi/cli/php_cli_server.c
Bugs:
https://bugs.php.net/68291
Changed paths:
MM sapi/cli/php_cli_server.c
Diff:
diff --cc sapi/cli/php_cli_server.c
index 709154d,4ed0efb..529f563
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@@ -91,10 -91,14 +91,10 @@@
# define SOCK_EADDRINUSE WSAEADDRINUSE
#endif
-#ifndef S_ISDIR
-#define S_ISDIR(mode) (((mode)&S_IFMT) == S_IFDIR)
-#endif
-
#include "ext/standard/file..h" /* for php_set_sock_blocking() :-( */
-#include "ext/standard/php_smart_str.h"
+#include "zend_smart_str.h"
#include "ext/standard/html.h"
- #include "ext/standard/url.h" /* for php_url_decode() */
+ #include "ext/standard/url.h" /* for php_raw_url_decode() */
#include "ext/standard/php_string.h" /* for php_dirname() */
#include "php_network.h"
@@@ -1467,7 -1577,7 +1467,7 @@@ static void normalize_vpath(char **retv
return;
}
- decoded_vpath_end = decoded_vpath + php_url_decode(decoded_vpath, (int)vpath_len);
- decoded_vpath_end = decoded_vpath + php_raw_url_decode(decoded_vpath, vpath_len);
++ decoded_vpath_end = decoded_vpath + php_raw_url_decode(decoded_vpath, (int)vpath_len);
#ifdef PHP_WIN32
{