Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #71906: AddressSanitizer: negative-size-param (-1) in mbfl_strcut
  Fix bug #71798 - Integer Overflow in php_raw_url_encode
  Fix bug #71860: Require valid paths for phar filenames
  Going for 5.5.34

Conflicts:
	configure.in
	ext/phar/tests/create_path_error.phpt
	main/php_version.h

diff --cc ext/phar/phar.c
index 228dfcaaaff820549b25694996ccd5a99283977e,17b0affd86ff751cb8e6046d04d91435b53fc6b8..14b80e175ed4d5bf11c890e1f30ea8225935b16c
--- 1/ext/phar/phar.c
--- 2/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@@ -2240,8 -2259,12 +2240,12 @@@ int phar_split_fname(const char *filena
  #ifdef PHP_WIN32
        char *save;
  #endif
 -      int ext_len, free_filename = 0;
 +      int ext_len;
  
+       if (CHECK_NULL_PATH(filename, filename_len)) {
+               return FAILURE;
+       }
+ 
        if (!strncasecmp(filename, "phar://", 7)) {
                filename += 7;
                filename_len -= 7;

diff --cc ext/phar/phar_object.c
Simple merge

diff --cc ext/phar/tests/phar_extract.phpt
Simple merge

diff --cc ext/standard/url.c
Simple merge