Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Bugfix #52958 and #57702 #118

Closed
wants to merge 10,000 commits into from

18 participants

Wong Hoi Sing Edison Christopher Jones Account for PHP Pull Requests Gustavo Lopes Stanislav Malyshev Xinchen Hui Reeze Xia Nikita Popov Anatol Belski Michael Wallner Felipe Pena Rasmus Lerdorf David Soria Parra Johannes Schlüter Dmitry Stogov Pierrick Charron stealth35 Moriyoshi Koizumi
Wong Hoi Sing Edison
  • Bug #52958 Segfault in PDO_OCI on cleanup after running a long testsuite.
  • Bug #57702 Multiple BLOB fetch fails.
cataphract and others added some commits
Gustavo Lopes cataphract Merge branch '5.3' into 5.4 485638a
Anatol Belski weltling Bug 61610 adopted expected warnings for 5.4 c7f9f54
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #61413 ext\openssl\tests\openssl_encrypt_crash.phpt fails 5.3 only
f21376d
Michael Wallner m6w6 fixed bug #61820
using ob_gzhandler will complain about headers already sent
when no compression

the Vary header should only be sent on the PHP_OUTPUT_HANDLER_START
event
df00b64
Michael Wallner m6w6 fix bug #61443
Since upgrade to PHP 5.4, we can't change zlib.output_compression on the
fly

the check for PHP_OUTPUT_WRITTEN was over-zealous
7c93a16
Michael Wallner m6w6 BFN 52cb8ed
Michael Wallner m6w6 fix NEWS order ac4d53c
Stanislav Malyshev smalyshev sync version 7d3d38a
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Partial fix for bug 61743 to get correct icacls path
459e758
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #61800 ext\standard\tests\streams\bug61371.phpt fails
19df3c1
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails

Conflicts:
	ext/sqlite3/tests/sqlite3_15_open_error.phpt
94d96f7
Anatol Belski weltling Fix bug 61786 Failing tests in ext\session\tests\* 3dbe487
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug 61685 putenv('TZ=UTC') doesn't update timezone for localtime()
6f8fae6
Felipe Pena felipensp Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  - Added missing bound check in iptcparse() (path by chris at chiappa.net)
6008f9a
Felipe Pena felipensp - Fixed bug #61827 (incorrect \e processing on Windows) patch by: ab@…
…php.net
cc5b995
Felipe Pena felipensp - BFN b336af2
Xinchen Hui laruence Merge remote-tracking branch 'origin/PHP-5.3' into PHP-5.4
* origin/PHP-5.3:
  Fixed bug #61546 (functions related to current script failed when chdir() in cli sapi).
  - BFN

Conflicts:
	sapi/cli/php_cli.c
fd518ff
Xinchen Hui laruence Merge remote-tracking branch 'origin/PHP-5.3' into PHP-5.4 72ccce4
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug ext\filter\tests\bug52209.phpt fails
455040c
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug 61870 ext\session\tests\bug42596.phpt fails
36836f1
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Additional fixs for bug 61746 - prepare/clean acls
fc24e74
Felipe Pena felipensp - Changed last commit to use VK_ESCAPE on Windows 3120387
Felipe Pena felipensp - Regenerated files 1622843
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug 61868 ext\dom\tests\DOMDocument_validate_on_parse_variation.phpt fails
47c8b60
Anatol Belski weltling Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 819a7ae
Felipe Pena felipensp - Fixed Windows build 79961dc
Felipe Pena felipensp - Regenerated files 4deb0f1
Christopher Jones Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix masking in bug61115-1.phpt
cac09f3
Christopher Jones Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Make output order for dom007.phpt platform independent
93192ec
Stanislav Malyshev smalyshev Revert "Fix bug #61537 (json_encode() incorrectly truncates/discards …
…information) and"

This reverts commit cb2a1c71c96d7c9b2ee03d77beae0c8e0d385f1b.
The fix is not correct, not fixed after discussion on github.
Please fix the issues and reapply the patch
7bbd552
Stanislav Malyshev smalyshev organize NEWS b0e8be8
Stanislav Malyshev smalyshev merge 5.3.11 stuff e25eea8
andrey Merge branch 'PHP-5.3' into PHP-5.4 6741949
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug 61902 ext\phar\tests\phar_setsignaturealgo2.phpt falis
cdce62b
Xinchen Hui laruence Merge remote-tracking branch 'origin/PHP-5.3' into PHP-5.4
* origin/PHP-5.3:
  Fix typo
75d23f5
Xinchen Hui laruence Fixed test bug #61892 d74d88f
Xinchen Hui laruence Fixed bug #61922 (ZTS build doesn't accept zend.script_encoding config) 72f19e9
Christopher Jones Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Bump to next version

Conflicts:
	configure.in
	main/php_version.h
31ab04e
Reeze Xia

I think use TSRMLS_CC instead of tsrm_ls would be much better here.

Look at this zend_destroy_rsrc_list(&EG(persistent_list) TSRMLS_CC); every Thread safe function use Macro.

tsrm_ls should not used directly by any code.

I've search here, only two tsrm_ls one original one newly added.

as I said: no need, TSRMLS_CC will always expand to tsrm_ls in ZTS .

anyway, I agree with that they should be consistent.

thanks, I will make them consistent later.

Reeze Xia

This line have it too, maybe you would fix them a time;)I'v search the whole repository.

weltling and others added some commits
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #61904 ext\phar\tests\tar\phar_setsignaturealgo2.phpt
16fdf86
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #61906 ext\phar\tests\zip\phar_setsignaturealgo2.phpt fails
f5936cc
Rasmus Lerdorf rlerdorf Fix for CVE-2012-1823 0556103
David Soria Parra dsp Merge branch 'PHP-5.3' into PHP-5.4
By Rasmus Lerdorf
* PHP-5.3:
  Fix for CVE-2012-1823 (cherry picked from commit 29300b1f9dab068d477b241d8fd872e3a7c829b3)
948ab62
Xinchen Hui laruence Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction) 19632ae
Xinchen Hui laruence Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  correct NEWS
  Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)

Conflicts:
	ext/curl/interface.c
0747b29
Nikita Popov nikic Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Add NEWS entry for bug #61961
  Fixed Bug #61961 (file_get_content leaks when access empty file with max length)
bef6111
Xinchen Hui laruence Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #61730 (Segfault from array_walk modifying an array passed by reference)
4cceeb2
Xinchen Hui laruence Merge branch 'PHP-5.3' into PHP-5.4 376635c
Xinchen Hui laruence correct variable name ad3a42c
Matt Ficken Fix bug 61769 Random failure of php_cli_server*phpt tests 87a011d
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug 61905 ext\phar\tests\zip\phar_commitwrite.phpt fails
  Fix bug 61903 ext\phar\tests\tar\phar_commitwrite.phpt fails
0966406
Stanislav Malyshev smalyshev improve fix for CVE-2012-1823 b501017
Xinchen Hui

Hi, how about:

if (!skip_getopt) {
while ((c = php_getopt(***)) {
}
}

anyway, it's a trivial one , ;)

Collaborator
johannes and others added some commits
Johannes Schlüter johannes Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  This will be PHP 5.3.14
  improve fix for CVE-2012-1823
3400914
Johannes Schlüter johannes Fix folding marks fb3b6bc
Johannes Schlüter johannes Fix #61704 (Crash apache, phpinfo() threading issue) e8e6611
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #61713 ext\standard\tests\strings\htmlentities10.phpt fails
8987ad5
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug 61713 check also that mbstring's found any internal_encoding
4b30798
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  updated NEWS
0b4d7a4
Stanislav Malyshev smalyshev fix bug #61807 - Buffer Overflow in apache_request_headers 20364bc
Stanislav Malyshev smalyshev ws + restore BC to apache_request_headers bd8912e
Stanislav Malyshev smalyshev restore BC 1919ec5
Stanislav Malyshev smalyshev c++ comments 057f471
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/*
87fa84a
David Soria Parra dsp Typo 2cb0ed1
Felipe Pena felipensp - Fixed bug #61978 (Object recursion not detected for classes that im…
…plement JsonSerializable)
92bc49b
Felipe Pena felipensp - BFN f46a064
Xinchen Hui laruence Fix test failed, the fsockopen will be refused immediately if the ser…
…ver is not set up.
7b2ab56
Xinchen Hui laruence Implemented FR #61977 (Need CLI web-server support for files with .ht…
…m & svg extensions)
1e60d0c
Xinchen Hui laruence Correct test title d394c17
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug 61901 ext\phar\tests\phar_buildfromdirectory2.phpt fails
f76d7be
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug ext\standard\tests\file\realpath_cache_win32.phpt fails
10d5f23
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  updated NEWS
19f85f8
Anatol Belski weltling updated NEWS fc0c905
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #61992 ext\standard\tests\general_functions\bug44295.phpt fails
b43d6c8
Reeze Xia reeze Cleanup useless function declaration for traits 0cb4849
Xinchen Hui laruence Merge branch 'remove-useless-func-decleare' of https://github.com/ree…
…ze/php-src into PHP-5.4
24e03d8
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #61990 ext\spl\examples\tests\dualiterator_001.phpt fails
4458f3b
Nuno Lopes fix stack overflow in php_intlog10abs()
bug uncovered by LLVM/clang's new -fbounds-checking switch
this patch fixes a crash in ext/standard/tests/math/round_large_exp.phpt
8b4b70d
Xinchen Hui laruence Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed Bug #62005 (unexpected behavior when incrementally assigning to a member of a null object)
  fix stack overflow in php_intlog10abs()

Conflicts:
	Zend/zend_execute.c
6a50955
Stanislav Malyshev smalyshev update NEWS 5848220
Stanislav Malyshev smalyshev fix bug #54547 9344bf1
Stanislav Malyshev smalyshev fix bug #61782 - __clone/__destruct do not match other methods when c…
…hecking access controls
a0dff6f
Stanislav Malyshev smalyshev update NEWS/UPGRADING a72b214
Nikita Popov

Why did you turn this inline function into a macro?

Collaborator
Reeze Xia

Thanks Sebastian for merging the patch. I've noticed that the NEWS entry didn't get merge properly:

https://github.com/php/php-src/blob/PHP-5.4/NEWS#L178 It has been merged under PHP-5.4.1 section :)

zoe slattery and others added some commits
zoe slattery Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Change impl of GZIP_POST, DEFLATE_POST. See #62021
968dfae
zoe slattery Small fixes to tests, see #62022 e35f09d
zoe slattery Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Small fixes to tests, see #62022
d99203d
zoe slattery Changes to remaining two tests, #62022 6340126
Stanislav Malyshev smalyshev fix bug #61065 a10e778
Stanislav Malyshev smalyshev fd fix df2a38e
Stanislav Malyshev smalyshev to 5.4.5-dev be8b1c7
Stanislav Malyshev smalyshev fix test e36a5a1
Stanislav Malyshev smalyshev Revert "Update test to fix breakage caused by the previous commit."
This reverts commit 05c8d4766c272e101b5279f0ec432e1b16e74637.
Connected to revert 7bbd5521d28ee77c5a8df80174f52dad0112e872.
d84fa39
Felipe Pena felipensp Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  - Fixed bug #55299 (multiple null pointer in win32/registry.c)
1abcd81
andrey Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
	ext/mysqlnd/mysqlnd_ps.c

merge fix for bug#62046
4d2d8e8
Johannes Schlüter johannes Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  fd fix
  fix bug #61065 (cherry picked from commit a10e778bfb7ce9caa1f91666ddf2705db7982d68)
1f6f619
Johannes Schlüter johannes Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  PHP 5.3.15-dev

Conflicts:
	configure.in
	main/php_version.h
89e7a19
Christopher Jones Dummy (whitespace) change so Dan Brown can verify snap generation fro…
…m git

PHP snapshots were still pulling from SVN and were out of date. This
is a dummy PHP 5.4-only commit so Dan can verify what he's updated for
git in the backend.
29a85d4
Felipe Pena felipensp Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  - Fixed bug #62064 (memory leak in the XML Writer module)
88275e5
Felipe Pena felipensp - BFN c9331a3
zoe slattery Fix: 62067 Moved comments to FILE section 867447f
Felipe Pena felipensp - Fixed bug #62025 (__ss_family was changed on AIX 5.3) ffe8303
Felipe Pena felipensp - BFN c5fcd9f
Dmitry Stogov dstogov Fixed bug #61998 (Using traits with method aliases appears to result …
…in crash during execution)
c8f47a8
Dmitry Stogov dstogov Fixed bug #61998 (Using traits with method aliases appears to result …
…in crash during execution)
2ae8d2f
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #62068 Test bug - gmp_nextprime and 022
  Fix: 62067 Moved comments to FILE section
  - BFN

Conflicts:
	NEWS
77e70b3
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #62066 Test Bug - ext/tidy/tests/004.phpt
fbb86bd
Xinchen Hui laruence Use emalloc instead of malloc bbcea23
Xinchen Hui laruence Use free instead of efree 4c9a11c
Felipe Pena felipensp - Fix the fix (typo s/AIX/_AIX/g) 074d361
Stanislav Malyshev smalyshev add news for new pg_ functions a472649
Jerome Loyet - fix NEWS for bug #61812 d1e529c
Jerome Loyet - Fixed bug #61045 (fpm don't send error log to fastcgi clients) dce2590
Jerome Loyet Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src:
  add news for new pg_ functions
bdf0c9c
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #62109 tests\basic\bug46313-win.phpt fails
  - Fixed bug #61045 (fpm don't send error log to fastcgi clients)
29876c5
Xinchen Hui laruence Revert "Implemented FR #61602 Allow access to name of constant used a…
…s default value"

This reverts commit 054f3e3ce5af13c2c3a6ccd54f7dc3e2f6cd4f74.

See: http://news.php.net/php.cvs/69137 and the author confirmed.
Will commit later after the author fixed this then make a new PR.

Conflicts:

	ext/reflection/php_reflection.c
df48176
Xinchen Hui laruence Revert NEWS 5b83161
Xinchen Hui laruence Merge remote-tracking branch 'origin/PHP-5.3' into PHP-5.4 8475c5b
Jerome Loyet - Fixed bug #61835 (php-fpm is not allowed to run as root) 06c7c36
Jerome Loyet - fix help message for '-R' 757e3fc
Jerome Loyet - Fixed bug #61295 (php-fpm should not fail with commented 'user' for…
… non-root start)
a07d76c
Gustavo Lopes cataphract Fix bug #62112: number_format() is not binary safe
The bug report actually urges PHP 5.3's behavior to be
reinstated -- that is, make "\0", when used as a separator,
be the same as no separator at all. I believe that is not a
proper course of action and that "\0" being interpreted as
no seperator was a bug in PHP 5.3.

Using "" for no separator, in both 5.3 and 5.4, before and
after this change, causes no separator to be used, so
there is no functionality loss.
3e62aae
Jerome Loyet - Fixed bug #61839 (Unable to cross-compile PHP with --enable-fpm) 0b44f16
Jerome Loyet Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src:
  Fix bug #62112: number_format() is not binary safe
d236c1a
Jerome Loyet - Fixed bug #61026 (FPM pools can listen on the same address) 1299503
Gustavo Lopes cataphract Merge branch '5.3' into 5.4
Conflicts:
	sapi/fpm/fpm/fpm_main.c
8ee8ccd
Gustavo Lopes cataphract Merge branch '5.3' into 5.4 0838a2b
Gustavo Lopes cataphract Fixed bug #62097
This fixes the fix for bug #54547 in 32-bit machines by accepting
float comparisons in 32-bit machines as long as the integer is
not larger than the mantissa.
acd7116
Rasmus Lerdorf rlerdorf Fix broken apache_request_headers test
This test depends on the default_charset setting, so set it to
UTF-8 for consistent output
523fd2c
Gustavo Lopes cataphract Merge branch '5.3' into 5.4 e8009e2
Anatol Belski weltling Fix bug #62137 ext\phar\tests\fatal_error_webphar.phpt fails b5511dc
Anatol Belski weltling Fixed bug #62138 ext\standard\tests\dir\dir_variation8-win32.phpt fails 0dc9b0e
Anatol Belski weltling Fix bug #62139 ext\standard\tests\file\rename_variation13-win32.phpt …
…fails
0e12a77
Gustavo Lopes cataphract Changed ResourceBundle constructor behavior
null is now accepted for two first (mandatory arguments).

Passing null as the package name causes NULL to be passed to ICU  and
the default ICU data to be loaded.

Passing null as the locale name causes the default locale to be used.
92039fe
Anatol Belski weltling Fixed bug #62140 ext\standard\tests\file\tempnam_variation7-win32.php…
…t fails
72c7cfe
Gustavo Lopes cataphract Fixed last commit on 5.4
There's no change from the intended behavior. If INTL_G(default_locale)
is NULL, the default ICU locale, as given by locale_get_default() in
master, will still be used by ures_open().
888e77f
Gustavo Lopes cataphract Merge branch '5.3' into 5.4 04fd0b1
Xinchen Hui laruence Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #62073 (Different ways of iterating over an SplMaxHeap result in different keys)
a10da87
Felipe Pena felipensp Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  - Fixed magic file regex support
84b2c39
Johannes Schlüter johannes Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #62146 	com_dotnet cannot be built shared, tested by Anatoliy
  Those changes are in 5.3.15
  - BFN
3cd50ca
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #62147 test bug - popen_pclose_basic-win32
6fb0e4a
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #62149 Test Bug - ext/curl/tests/bug61948
  Fixed bug #62148 mail_skipif doesn't skip imap tests on Release Build
16a592b
Xinchen Hui laruence Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #62128 superfluous ";"
91ad40d
Jerome Loyet - Fixed bug #62033 (php-fpm exits with status 0 on some failures to s…
…tart)
c2f33fb
Jerome Loyet - Fixed bug #62153 (when using unix sockets, multiples FPM instances …
…can be launched without errors)
d90003b
Jerome Loyet - add missing headers to avoid warnings 0037598
Jerome Loyet - Fixed bug #62160 (Add process.priority to set nice(2) priorities) decc394
Jerome Loyet Fixed bug #62033 (USR2 signal was sent even if not catch when daemoni…
…ze and an error occured)
e052da3
Jerome Loyet Fixed bug #61218 (FPM drops connection while receiving some binary va…
…lues in FastCGI requests)
60cca8b
Jerome Loyet Fixed bug #61218 (the previous patch was not enough restritive on fcg…
…i name string checks)
773e85a
Nuno Lopes sync with HEAD 339508d
Stanislav Malyshev smalyshev add bug #62082 4b04bf8
Stanislav Malyshev smalyshev add bug 62146 0a90643
Stanislav Malyshev smalyshev add CVE 213119c
Stanislav Malyshev smalyshev fix unchecked emalloc 158d8a6
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phpt
  sync with HEAD
  Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks)
  Fixed bug #61218 (FPM drops connection while receiving some binary valuesin FastCGI requests)
  - Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured)
  - Fixed bug #62160 (Add process.priority to set nice(2) priorities)
  - add missing headers to avoid warnings
  - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors)
  - Fixed bug #62033 (php-fpm exits with status 0 on some failures to start)

Conflicts:
	NEWS
	sapi/fpm/fpm/fpm_main.c
c4f9b01
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt
  Bug #62177 deactivate the linux test version on win
  Fix bug #62177 Test Bug - finfo_file_regex.phpt
c0e046a
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  updated the libmagic patch after Felipes regex fix
6074da9
Stanislav Malyshev smalyshev Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  fix CVE-2012-2143
692b3bc
Xinchen Hui laruence Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Typofix in comment in proc_open.c
7511f97
Stanislav Malyshev smalyshev fix test abe6362
Stanislav Malyshev smalyshev fix test 9b98cf7
Johannes Schlüter johannes Fix bug #62186 readline fails to compile 428dddd
Johannes Schlüter johannes Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  fix unchecked emalloc (cherry picked from commit 158d8a6b088662ce9d31e0c777c6ebe90efdc854)
303dd7f
Stanislav Malyshev smalyshev fix bug #55042 - erealloc without updating pointer ed6ce83
Stanislav Malyshev smalyshev sort NEWS 5ebb0e5
Xinchen Hui laruence Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed Bug #62202 (ReflectionParameter::getDefaultValue() memory leaks with constant)
b548d9a
Jerome Loyet - Comment unused function to avoid warnings 43ec708
Jerome Loyet - fix missing include for unix sockets ec4a1d5
Jerome Loyet - Fixed bug #62205 (php-fpm segfaults (null passed to strstr)) 238caeb
Jerome Loyet Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src: (27 commits)
  Fixed Bug #62202 (ReflectionParameter::getDefaultValue() memory leaks with constant)
  sort NEWS
  fix bug #55042 - erealloc without updating pointer
  Fix bug #62186 readline fails to compile
  fix unchecked emalloc (cherry picked from commit 158d8a6b088662ce9d31e0c777c6ebe90efdc854)
  fix test
  fix test
  Typofix in comment in proc_open.c
  fix CVE-2012-2143
  updated the libmagic patch after Felipes regex fix
  Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt
  Bug #62177 deactivate the linux test version on win
  Fix bug #62177 Test Bug - finfo_file_regex.phpt
  Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phpt
  fix unchecked emalloc
  add CVE
  add bug 62146
  add bug #62082
  sync with HEAD
  sync with HEAD
  ...
1fa8ecd
Felipe Pena felipensp Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  - Optimize comparison between same HashTable pointer
  - Fixed bug #62205 (php-fpm segfaults (null passed to strstr))
  - fix missing include for unix sockets
  - Comment unused function to avoid warnings
60c5f99
Felipe Pena felipensp Merge commit 'e59b6dc0ae803d49c3f620818285f98dfb61fd57' into PHP-5.4 8779a9a
Stanislav Malyshev smalyshev restore NEWS db1e425
Stanislav Malyshev smalyshev merge 5.3 entries e118a07
Xinchen Hui laruence Merge branch 'PHP-5.3' into PHP-5.4
By Gustavo André dos Santos Lopes (4) and others
via Felipe Pena (1) and Xinchen Hui (1)
* PHP-5.3:
  Remove unused codes
  based on microsoft's description,the direct convert from FILETIME struct to __int64 is unsafe.
  Fix ext/intl build on ICU < 4.8
  Optimization in ext/intl/msgformat
  Fixed tests in ext/intl
  Changed XFAILed collator_get_sort_key.phpt
83542dc
David Soria Parra dsp Merge branch 'PHP-5.3' into PHP-5.4
By Till Klampaeckel
* PHP-5.3:
  Don't depend on a fixed path for PHP shebang but use /usr/bin/env (cherry picked from commit 89c5d981603ed4a2a54f86c20cec4f263c58ded6)
deac80e
Pierrick Charron adoy Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that includes a semi-colon)
494c170
Pierrick Charron adoy Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Regenerated files
8e65ce3
Pierrick Charron adoy Regenerated files c975320
Felipe Pena felipensp - Fix merge 7881158
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  zip windows fixes
  fixed bc break related to #57905
  fixed a bit overlooked from the last libzip port
  brought the fix for #47667 back
  fixed zip entry freeing
  rechecked the merged libzip, took also the indents from the original to avoid confusion next time
  fixed a double freeing crash
  fixed header include
  initial libzip upgrade patch to 0.10.1
  - BFN

Conflicts:
	NEWS
5ebdc46
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  updated NEWS
d206206
Anatol Belski weltling updated NEWS 7907dc4
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  set current versions for libzip and zip ext
d24d5b6
Stanislav Malyshev smalyshev fix potential overflow in _php_stream_scandir 10e8da1
Stanislav Malyshev smalyshev add NEWS 0e3a650
Stanislav Malyshev smalyshev Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  improve overflow checks
  fix potential overflow in _php_stream_scandir
59eaa7c
Pierrick Charron adoy NEWS File c467e81
Stanislav Malyshev smalyshev typo ba8333c
Stanislav Malyshev smalyshev rearrange news c4cc431
Gustavo Lopes cataphract Fix bug #62266
Custom extension segfaults during xmlParseFile with FPM SAPI
because the regular list is not prepared during the MINIT phase
and our custom external entity loader tries to open PHP streams.
503358c
David Soria Parra dsp Merge branch 'PHP-5.3' into PHP-5.4
By Stanislav Malyshev (1) and michelangelo (1)
* PHP-5.3:
  Adding a test for ext/posix/tests/posix_getegid_basic.phpt
  typo
b9babd2
David Soria Parra dsp Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Make travis silent
51a5e98
Stanislav Malyshev smalyshev typo fix b55e692
Matt Ficken Fix bug #62271 test bug - ext/wddx/tests/bug48562.phpt a18cede
Scott MacVicar Add PBKDF2 support via openssl()
Summary:
No easy way to put these in the hash extension since we don't really support optional
parameters to certain algorithms. Implemented in openssl for now since it has it already
and is pretty stable.

Only SHA1 is confirmed to work as an algorithm but openssl has a parameter so it can be
changed in the future.

Will backport to 5.4 potentially with Stas' approval.

Test Plan:
Ran newly added tests which came from RFC 6070
b5b8ea1
Scott MacVicar Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound li…
…ke a spell.

Summary:
Stas pointed out that this is named pretty poorly. Go for openssl_pbkdf2()
bccd1e6
Stanislav Malyshev smalyshev add CVE f8cc363
Stanislav Malyshev smalyshev Revert "Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't …
…sound like a spell."

This reverts commit bccd1e672fabc3c788e93075221d47d9f077b167.
Looks like we don't have agreement yet on this for 5.4. Let's keep it in 5.5 for now.
a2bfad0
Stanislav Malyshev smalyshev Revert "Add PBKDF2 support via openssl()"
This reverts commit b5b8ea1050837fba5a6cee55e41b4574ed64158e.
Looks like we don't have agreement yet on this for 5.4. Let's keep it in 5.5 for now.
c7be96b
Stanislav Malyshev smalyshev re-add 61755 to NEWS 79e44c3
Johannes Schlüter johannes Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Merge PHP 5.3.14 NEWS
  re-add 61755 to NEWS
fef691b
Anatol Belski weltling Fix bug #62270 Test bug - ext/fileinfo/tests/finfo_open_error-win32 3faebe2
Anatol Belski weltling Fixed bug #62312 ext\sockets\tests\socket_import_stream-4.phpt fails 280e3a4
stealth35 stealth35 Fix potential leak in cli server 11a202e
Xinchen Hui

thanks for spotting this, merged.

weltling and others added some commits
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Reverted the BC fix regarding to #57905, test adopted
c56ff2b
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  com ext upgrading info
b408028
Anatol Belski weltling com ext upgrading infos 1c4e486
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  com ext upgrading correction
d8ba49a
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  split gzgetc_basic.phpt for zlib 1.2.7
0a65b66
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  one more correction for COM upgrading notes
df138c5
Anatol Belski weltling one more correction for COM upgrading notes 5c001d4
Anatol Belski weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  sync zip ext version with pecl
34bd1c9
Nikita Popov nikic Fixed bug RecursiveArrayIterator does not implement Countable
ArrayIterator implemented Countable only after it was already inherited by
RecursiveArrayIterator. Thus the interface was missing in RAI.
4cba4c6
Nikita Popov nikic Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug RecursiveArrayIterator does not implement Countable

Conflicts:
	ext/spl/spl_array.c
cce4764
Nikita Popov nikic Merge branch 'PHP-5.3' into PHP-5.4
I messed up the last merge somehow :/ Merge again.

* PHP-5.3:
  Add NEWS for bug #62262
  Fixed bug RecursiveArrayIterator does not implement Countable

Conflicts:
	ext/spl/spl_array.c
02cda8f
Johannes Schlüter johannes Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Remove outdated and user-specific files
041dd77
Johannes Schlüter johannes Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Improve check for :memory: pseudo-filename in SQlite

Conflicts:
	ext/sqlite3/sqlite3.c
af51675
Felipe Pena felipensp Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  - Fixed bug #62384 (Attempting to invoke a Closure more than once causes segfaul)
4af92ac
Johannes Schlüter johannes Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Remove extra ;
5e23a04
Johannes Schlüter johannes Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Remove unneeded and outdated ChangeLog file
2418791
Felipe Pena felipensp Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  - Improved fix for #62384
5e36306
Felipe Pena felipensp - BFN e886272
Nikita Popov nikic Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Improve json_encode error handling
  - BFN

Conflicts:
	ext/json/json.c
36fa17a
Christopher Jones

Can you split the request into the two parts?
Can you add LOB tests?
Can you review/update pdo_oci_attr_autocommit_3.phpt which gives a diff with your patch?

Xinchen Hui laruence Fixed bug #62357 (compile failure: (S) Arguments missing for built-in…
… function __memcmp).

Any C library function may be a macro, We should avoid using ZEND_STRS(L) as their arguments
a44a1dc
Christopher Jones

Also, did you check what effect (if any) the changes have on persistent connections?

smalyshev and others added some commits
Stanislav Malyshev smalyshev Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  ws fix
  BFN
  Fix bug #62373 (serialize() generates wrong reference to the object)

Conflicts:
	php.ini-development
	php.ini-production
ffcfa6f
Stanislav Malyshev smalyshev update NEWS 7a0f4cf
Johannes Schlüter johannes Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix memleak in CLI

Conflicts:
	sapi/cli/php_cli.c
9a86784
Nikita Popov nikic Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Improve JSON error handling

Conflicts:
	ext/json/tests/bug54058.phpt
	ext/json/tests/bug61537.phpt
d372b33
Wong Hoi Sing Edison hswong3i * Bug #52958 Segfault in PDO_OCI on cleanup after running a long test…
…suite
0244f46
Wong Hoi Sing Edison

Already split the patch, where #52958 checking with H->err should generally looks good?

Christopher Jones

Did you decide against changing OCITransRollback to an OCISessionEnd? Or will you create another pull request? That change seemed to fix pdo_oci_attr_autocommit_3.phpt and make the edge-case behavior the same as pdo_mysql.

johannes and others added some commits
Johannes Schlüter johannes Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix #62432 ReflectionMethod random corrupt memory on high concurrent

Conflicts:
	ext/date/php_date.c
	ext/fileinfo/fileinfo.c
	ext/pdo/pdo_dbh.c
	ext/pdo/pdo_stmt.c
	ext/reflection/php_reflection.c
	ext/spl/spl_array.c
	ext/spl/spl_directory.c
	ext/spl/spl_dllist.c
	ext/spl/spl_fixedarray.c
	ext/spl/spl_heap.c
	ext/spl/spl_iterators.c
	ext/spl/spl_observer.c
	ext/sqlite/sqlite.c
	ext/sqlite3/sqlite3.c
	ext/tidy/tidy.c
	ext/xmlreader/php_xmlreader.c
	ext/xmlwriter/php_xmlwriter.c
	ext/xsl/php_xsl.c
	ext/zip/php_zip.c
2996eee
Wong Hoi Sing Edison hswong3i * Bug #52958 Segfault in PDO_OCI on cleanup after running a long test…
…suite
568f3fb
Wong Hoi Sing Edison hswong3i Merge branch '52958' of https://github.com/hswong3i/php-src into 52958 475349f
Nikita Popov nikic Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Add json_last_error_msg() function
405ebfc
Anthony Ferrara Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed Salt)
34ab565
Stanislav Malyshev smalyshev fix NEWS order 8992da2
andrey Merge branch 'PHP-5.3' into PHP-5.4 08f4b3c
Nikita Popov nikic Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix some lengths in crypt()

Conflicts:
	ext/standard/crypt.c
d86b6ea
andrey Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4 a19d5c5
andrey Merge branch 'PHP-5.3' into PHP-5.4 a614f8e
andrey Merge branch 'PHP-5.3' into PHP-5.4 b7dbcbd
andrey merge ed1f058
Wong Hoi Sing Edison hswong3i * Bug #52958 Segfault in PDO_OCI on cleanup after running a long test…
…suite
81f568c
root Merge branch '52958' of https://github.com/hswong3i/php-src into 52958 c390ad2
Account for PHP Pull Requests
Collaborator

Comment on behalf of stas at php.net:

This pull does not look correct - too many unrelated patches. Please clean up and resubmit.

Account for PHP Pull Requests php-pulls closed this
Stanislav Malyshev

Is this the correct name for the test? Seems to have nothing to do with IntlCalendar...

Fixed that in 86ca788.

Stanislav Malyshev

This fails for me (ICU 4.2.1) - produces Warning: ResourceBundle::get(): Cannot load resource element 'DateTimePatterns'.

It fails with ICU 4.4 too (only the pt_PT parts works, but in any case the pattern returned is different). I have no idea why. Even going back in ICU's history, the only difference I can find (in the relatively short time I dedicated to this) between what PHP does in this case and what ICU does to retrieve the patterns is that ICU calls ures_getByKeyWithFallback instead of ures_getByKey. I don't know the ICU ResourceBundle API or implementation very well, so it would take me quite a lot of effort to get to the bottom of this. I'll have this test be ICU 4.8+, since I originally tested this on that version.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.