* pull-request/132:
OK, bye bye JavaScript, let's just include credits before license
Nicer (JSLint-compliant!) credits reveal JavaScript
Removed now-unnecessary expose_php checks for logo
Fixed small misalignment in prev commit
Removed Logo GUIDs and replaced with Data URIs and div hidden with JS
- removed php_logo_guid()
- removed php_egg_logo_guid()
- removed php_real_logo_guid()
- removed zend_logo_guid()
- removed logo GUID handling
- removed logo GUIDs from source
- added logo data URIs instead for phpinfo()
- added credits to phpinfo() page, but hidden by default
* '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 158d8a6b08)
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
...
* 'master' of git.php.net:php-src: (43 commits)
close the stream whenever possible, no need to keep it open altough the connection is marked as unusable
Fixed Bug #62202 (ReflectionParameter::getDefaultValue() memory leaks with constant)
more refactoring stuff. Reduced code duplication in the authentication code
sort NEWS
fix bug #55042 - erealloc without updating pointer
Fix bug #62186 readline fails to compile
fix unchecked emalloc (cherry picked from commit 158d8a6b08)
small refactoring - factour out code from connection establishment. Add a define for the default authentication protocol - get away from the hardcoded magic value
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
...
* PHP-5.4: (21 commits)
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
Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks)
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 values in FastCGI requests)
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 #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)
- Fixed bug #62160 (Add process.priority to set nice(2) priorities)
- add missing headers to avoid warnings
- add missing headers to avoid warnings
- Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors)
- 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
* 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
Lars Strojny