Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix #68291: 404 on urls with '+'

Resolved conflicts:
	sapi/cli/php_cli_server.c

diff --cc sapi/cli/php_cli_server.c
index 709154da70431519e3fd84b69622a20b98902eed,4ed0efb820f8f2048d5caae3523f6de2a9dc9db1..529f5633bfe787eb45e5920dca3b7cbb76043a82
--- 1/sapi/cli/php_cli_server.c
--- 2/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
        {