Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
* 'PHP-5.4' of https://git.php.net/repository/php-src:
Merge PHP 5.3.27 NEWS
add test for bug #65236
fix possible resource leak and make sure there's something to qsort()
- Updated to version 2013.4 (2013d)
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
# By Stanislav Malyshev (3) and others
# Via Stanislav Malyshev (1) and Yasuo Ohgaki (1)
* 'PHP-5.4' of https://git.php.net/repository/php-src:
Update NEWS
Fixed bug #35703: when session_name("123") consist only digits, should warning
Fixed bug #49175: mod_files.sh does not support hash bits
add fix for #60560 into upgrading
Add a __wakeup() method to SplFixedArray, thereby fixing serialising an
small optimization
fix bug #61860: use USearch for searches, it does the right thing
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
# By Felipe Pena (9) and others
# Via Arpad Ray (1) and Felipe Pena (1)
* 'PHP-5.4' of https://git.php.net/repository/php-src:
Update NEWS
Fix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented
Fixed bug #65136 (RecursiveDirectoryIterator segfault)
- BFN
- Fixed bug #64467 (Segmentation fault after imap_reopen failure) patch by: askalski at gmail dot com
- Reclassify bug
- BFN
- Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at web dot de
- Fixed bug #63409 (php-dba function test fails on big-endian machine) patch by: tianhonglouis at gmail dot com
- Fixed test
add new test
Update NEWS
Fixed bug #65015 (pg_send_query does not flush send buffer) patch submitted by: adam at vektah dot net
- BFN
- Fixed bug #62475 (variant_* functions causes crash when null given as an argument)
Arpad Ray [Thu, 27 Jun 2013 18:05:23 +0000 (19:05 +0100)]
Fix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented
When uploading multiple files, the array in the session where the progress
data is stored (and cancel_upload key is set) was overwritten whenever the
progress data was updated, so pending uploads would proceed anyway.
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
# By Felipe Pena
# Via Felipe Pena
* 'PHP-5.4' of https://git.php.net/repository/php-src:
- BFN
- Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
- BFN
- Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
Adam Harvey [Sun, 23 Jun 2013 18:01:36 +0000 (11:01 -0700)]
Fix bug #65088 (Generated configure script is malformed on OpenBSD).
We fell foul of a "common urban legend"[0], which resulted in us backslash
escaping double quotes that we didn't need to in acinclude.m4. This worked fine
on most shells, but OpenBSD's ksh implementation really didn't like it.
Adam Harvey [Wed, 19 Jun 2013 18:32:37 +0000 (11:32 -0700)]
Change the search in get_status_string() to correctly handle unknown codes.
This previously used a buggy implementation of binary search that would loop
infinitely for unknown codes when searching in reason arrays of particular
sizes (such as the one we have at the moment). Since C provides bsearch(),
we'll just use that instead, since libc authors hopefully get this right.
There was also an additional bug that was masked by the first one: the design
was that an unknown code would result in get_status_string() returning NULL,
which would then result in a segfault in append_http_status_line(), since it
assumed that it would always receive a valid string pointer that could be
handed off to smart_str_appends_ex(). We'll now return a placeholder in that
case.
Fixes bug #65066 (Cli server not responsive when responding with 422 http
status code).
* pull-request/320:
this is test 5 not 6
fix race condition
more shared names that create race conditions
change to a unique filename
more shared filenames
yet another shared filename
don't share a filename to stop race conditions
fix race condition for 2-4 and normalize names for others
fix race condition when running tests in parallel
clean up after test
Fix #64572: Clean up after the test
Fix #64572: Clean up after the test