Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
# By Johannes Schlüter (3) and others
# Via Xinchen Hui (3) and others
* 'PHP-5.5' of https://git.php.net/repository/php-src:
Upper section name
Update NEWs
Fixed bug #65328 (Segfault when getting SplStack object Value)
Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro.
fix missing include
Fix bug 65299
Fix compiler warning on redefined constant
Fix comment
fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents
Adam Harvey [Tue, 23 Jul 2013 18:15:43 +0000 (11:15 -0700)]
Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro.
On most platforms, this works fine, but on Linux armhf, strncmp() is a macro
rather than a real function, ergo the macro expansion of ZEND_STRL doesn't
occur until after the compiler knows it needs three parameters for strncmp()
and we get a compile error.
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
# By Anatol Belski (12) and others
# Via Stanislav Malyshev (12) and others
* 'PHP-5.5' of https://git.php.net/repository/php-src: (74 commits)
fixed possible null deref
- addressed bug #65159, Misleading configure help text for --with-mysql-sock
Fix bug #61697 - spl_autoload_functions returns lambda functions incorrectly
Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
Added recursivetreeiterator::setPostfix() method
next is 5.5.2
add a few comment
allow both the old and new cfg argument to work. (the old of course should contain the typo)
mssql.compatability_mode fix
backward compatibility
HASH_KEY_NON_EXISTANT fix
Update NEWS
Fixed bug #65304 (Use of max int in array_sum)
Updaet NEWS
Reorder NEWS
intl: remove extra quotes from arginfo params
Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
Properly fixed bug #63186 on NetBSD == 6.0
...
Arpad Ray [Wed, 17 Jul 2013 15:07:26 +0000 (16:07 +0100)]
Fixed bug #50308 - session id not appended properly for empty anchor tags
The issue was actually because a lack of space before a "/" marking the tag
as empty. This was being swallowed in the rule for unquoted values. Fixed
by making that rule exclude quotes (as per spec anyway).
The data for messages of type SOL_SOCKET/SCM_RIGHTS was not being
passed correctly. There were actually two bugs: (1) the number of file
descriptors being passed was being read incorrectly (the length of the
cmsg array was being read instead of that of its 'data' element), as a
result it was generally being reported as always three elements
('level', 'type' and 'data') and (2) the allocated block for writing
the file descriptors was being acessed incorrectly because a 1-based
counter was being used as if it was 0-based.
Any of these two bugs would probably be enough to cause heap
corruption.
* PHP-5.4:
fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too)
fix invalid variable name at ext/spl/internal/multipleiterator.inc
* PHP-5.4:
Add built-in web server to invocation list
Terminology: change embedded web server to built-in web server to align with cli usage
Align -B and -E parameter names with cli usage (begin_code and end_code)
Fix Bug #65219 DBSETLDBNAME should be called before login to set DBNAME in login record
Merge branch 'PHP-5.3' of https://git.php.net/push/php-src into PHP-5.3
* 'PHP-5.3' of https://git.php.net/push/php-src: (23 commits)
Merge PHP 5.3.27 NEWS
add test for bug #65236
truncate results at depth of 255 to prevent corruption
fix assembly of safe_address() for x86 and x86_64
Add bison 2.6.4 to the list of supported versions
Update git rules (5.5 is stable, 5.3 sec only)
This will be PHP 5.3.28
Fixed bug #63186 (compile failure on netbsd)
ensure the error_reporting level to get expected notice
fixed tests
missing tests for bug #53437
missing colon
Backported the fix for bug #53437
Fixed test script
Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on 64-bits systems)
Fixed bug #64966 (segfault in zend_do_fcall_common_helper_SPEC)
Fixed bug #64934 Apache2 TS crash with get_browser()
Add NEWS for PHP 5.3.26
Fixed bug #64960 (Segfault in gc_zval_possible_root)
fix CVE-2013-2110 - use correct formula to calculate string size
...