Scott MacVicar [Mon, 11 Jun 2012 07:16:30 +0000 (00:16 -0700)]
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
Travis will always build all branches. As we just have a .travis.yml
on master, travis will go ahead and checkout PHP-5.3. It fails and
then sends mails. We really don't want to get spammed, so we add
a .travis.yml that is just silent.
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.
Anatoliy Belsky [Thu, 7 Jun 2012 19:06:31 +0000 (21:06 +0200)]
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
Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that includes a semi-colon)
Modify the scanner to check if the first char of the raw data is an opening " in which case we
need to find the closing one. Otherwise just search for the next end of value char [\r\n;\000]
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)
Xinchen Hui [Thu, 7 Jun 2012 06:32:47 +0000 (14:32 +0800)]
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
Ressurected and limited to ICU 4.8 in the hope that the sort keys
will remain stable in more recent ICU versions. I have only tested
with ICU 4.8 so far.
Felipe Pena [Sun, 3 Jun 2012 21:20:26 +0000 (18:20 -0300)]
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
Jerome Loyet [Fri, 1 Jun 2012 09:30:49 +0000 (11:30 +0200)]
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
...
Anatoliy Belsky [Tue, 29 May 2012 14:43:20 +0000 (16:43 +0200)]
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
Anatoliy Belsky [Tue, 29 May 2012 10:19:20 +0000 (12:19 +0200)]
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)
projects / php / log