[PHP-CVS] com php-src: Improve error message for ssl request: sapi/cli/php_cli_server.c
Commit:a88eca53f708602384cae147a8376352d5909d90
Author:Xinchen Hui larue...@php.net Sun, 22 Jul 2012 19:20:23
+0800
Parents: fd50bf2085982e28b42a8665dd71009205eec108
Branches: PHP-5.4
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=a88eca53f708602384cae147a8376352d5909d90
Log:
Improve error message for ssl request
Changed paths:
M sapi/cli/php_cli_server.c
Diff:
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index 876c57a..02f8854 100644
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@ -1618,7 +1618,11 @@ static int
php_cli_server_client_read_request(php_cli_server_client *client, cha
client-parser.data = client;
nbytes_consumed = php_http_parser_execute(client-parser, settings,
buf, nbytes_read);
if (nbytes_consumed != nbytes_read) {
- *errstr = estrdup(Malformed HTTP request);
+ if (buf[0] 0x80 /* SSLv2 */ || buf[0] == 0x16 /* SSLv3/TLSv1
*/) {
+ *errstr = estrdup(Unsupported SSL request);
+ } else {
+ *errstr = estrdup(Malformed HTTP request);
+ }
return -1;
}
if (client-current_header_name) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: PHP 5.3.15: NEWS configure.in main/php_version.h
Commit:c180a72112d59ea4a9aa974dec210420862af465 Author:Johannes Schlüter johan...@php.net Fri, 13 Jul 2012 00:17:37 +0200 Parents: 1f6c43f0555038056c123945e6600c3a18ac2407 Branches: PHP-5.3.15 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c180a72112d59ea4a9aa974dec210420862af465 Log: PHP 5.3.15 Changed paths: M NEWS M configure.in M main/php_version.h Diff: diff --git a/NEWS b/NEWS index 1f64cc0..88bdc0d 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,7 @@ PHPNEWS ||| -05 Jul 2012, PHP 5.3.15RC1 +19 Jul 2012, PHP 5.3.15 + - Zend Engine: . Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that includes a semi-colon). (Pierrick) @@ -9,8 +10,8 @@ PHP NEWS . Fixed bug #62146 com_dotnet cannot be built shared. (Johannes) - Core: - . Fixed potential overflow in _php_stream_scandir. (Jason Powell, -Stas) + . Fixed potential overflow in _php_stream_scandir, CVE-2012-2688. (Jason +Powell, Stas) . Fixed bug #62432 (ReflectionMethod random corrupt memory on high concurrent). (Johannes) . Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed @@ -44,7 +45,7 @@ PHP NEWS . Fixed bug #60785 (memory leak in IntlDateFormatter constructor). (Gustavo) - JSON: - . Improved error handling. (Nikita Popov) + . Reverted fix for bug #61537. (Johannes) - Phar: . Fixed bug #62227 (Invalid phar stream path causes crash). (Felipe) @@ -59,6 +60,10 @@ PHP NEWS . Fixed bug #62262 (RecursiveArrayIterator does not implement Countable). (Nikita Popov) +- SQLite: + . Fixed open_basedir bypass, CVE-2012-3365. (Johannes, reported by Yury +Maryshev) + - XML Writer: . Fixed bug #62064 (memory leak in the XML Writer module). (jean-pierre dot lozi at lip6 dot fr) diff --git a/configure.in b/configure.in index c98260d..3e568b3 100644 --- a/configure.in +++ b/configure.in @@ -42,7 +42,7 @@ AC_CONFIG_HEADER(main/php_config.h) PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=3 PHP_RELEASE_VERSION=15 -PHP_EXTRA_VERSION=RC1 +PHP_EXTRA_VERSION= PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` diff --git a/main/php_version.h b/main/php_version.h index 103caba..b69df58 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 3 #define PHP_RELEASE_VERSION 15 -#define PHP_EXTRA_VERSION RC1 -#define PHP_VERSION 5.3.15RC1 +#define PHP_EXTRA_VERSION +#define PHP_VERSION 5.3.15 #define PHP_VERSION_ID 50315 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: merge 5.3.15 NEWS: NEWS
Commit:ffa8461bfebebd8158cdb26ad5f3439c527545f7 Author:Johannes Schlüter johan...@php.net Sun, 22 Jul 2012 22:45:39 +0200 Parents: 777b6679a41abe40c4211c2f2a906a5218680872 Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ffa8461bfebebd8158cdb26ad5f3439c527545f7 Log: merge 5.3.15 NEWS Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index e6b51a9..8f55123 100644 --- a/NEWS +++ b/NEWS @@ -2,10 +2,6 @@ PHP NEWS ||| ?? ??? 2012, PHP 5.3.16 -?? ??? 2012, PHP 5.3.15 - (NEWS will be merged after release by johannes. Formerging changes to the - PHP-5.3.15 release branch talk to johannes) - - CURL: . Fixed bug #62499 (curl_setopt($ch, CURLOPT_COOKIEFILE, ) returns false). (r.hampartsum...@gmail.com, Laruence) @@ -17,6 +13,77 @@ PHP NEWS . Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance gives Segmentation fault). (Laruence, Gustavo) +19 Jul 2012, PHP 5.3.15 + +- Zend Engine: + . Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that +includes a semi-colon). (Pierrick) + +- COM: + . Fixed bug #62146 com_dotnet cannot be built shared. (Johannes) + +- Core: + . Fixed potential overflow in _php_stream_scandir, CVE-2012-2688. (Jason +Powell, Stas) + . Fixed bug #62432 (ReflectionMethod random corrupt memory on high +concurrent). (Johannes) + . Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed +Salt). (Anthony Ferrara) + +- Fileinfo: + . Fixed magic file regex support. (Felipe) + +- FPM: + . Fixed bug #61045 (fpm don't send error log to fastcgi clients). (fat) + . Fixed bug #61835 (php-fpm is not allowed to run as root). (fat) + . Fixed bug #61295 (php-fpm should not fail with commented 'user' +for non-root start). (fat) + . Fixed bug #61026 (FPM pools can listen on the same address). (fat) + . Fixed bug #62033 (php-fpm exits with status 0 on some failures to start). +(fat) + . Fixed bug #62153 (when using unix sockets, multiples FPM instances +can be launched without errors). (fat) + . Fixed bug #62160 (Add process.priority to set nice(2) priorities). (fat) + . Fixed bug #61218 (FPM drops connection while receiving some binary values +in FastCGI requests). (fat) + . Fixed bug #62205 (php-fpm segfaults (null passed to strstr)). (fat) + +- Intl: + . Fixed bug #62083 (grapheme_extract() memory leaks). (Gustavo) + . Fixed bug #62081 (IntlDateFormatter constructor leaks memory when called +twice). (Gustavo) + . Fixed bug #62070 (Collator::getSortKey() returns garbage). (Gustavo) + . Fixed bug #62017 (datefmt_create with incorrectly encoded timezone leaks +pattern). (Gustavo) + . Fixed bug #60785 (memory leak in IntlDateFormatter constructor). (Gustavo) + +- JSON: + . Reverted fix for bug #61537. (Johannes) + +- Phar: + . Fixed bug #62227 (Invalid phar stream path causes crash). (Felipe) + +- Reflection: + . Fixed bug #62384 (Attempting to invoke a Closure more than once causes +segfault). (Felipe) + . Fixed bug #62202 (ReflectionParameter::getDefaultValue() memory leaks +with constant). (Laruence) + +- SPL: + . Fixed bug #62262 (RecursiveArrayIterator does not implement Countable). +(Nikita Popov) + +- SQLite: + . Fixed open_basedir bypass, CVE-2012-3365. (Johannes, reported by Yury +Maryshev) + +- XML Writer: + . Fixed bug #62064 (memory leak in the XML Writer module). +(jean-pierre dot lozi at lip6 dot fr) + +- Zip: + . Upgraded libzip to 0.10.1 (Anatoliy) + 14 Jun 2012, PHP 5.3.14 - CLI SAPI: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix Bug #62612 readline extension compilation fails: NEWS sapi/cli/config.m4
Commit:860b3ffe75a95f18ff3bf570c49c5004cb70cab1 Author:Johannes Schlüter johan...@php.net Sun, 22 Jul 2012 23:28:32 +0200 Parents: 254d299d0768562d60a12af0b05678ec7bff94cb Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=860b3ffe75a95f18ff3bf570c49c5004cb70cab1 Log: Fix Bug #62612 readline extension compilation fails Bugs: https://bugs.php.net/62612 Changed paths: M NEWS M sapi/cli/config.m4 Diff: diff --git a/NEWS b/NEWS index 8ae6931..883d910 100644 --- a/NEWS +++ b/NEWS @@ -24,6 +24,10 @@ PHP NEWS - MySQLnd: . Fixed bug #62594 (segfault in mysqlnd_res_meta::set_mode). (Laruence) +- readline: + . Fixed bug #62612 (readline extension compilation fails with +sapi/cli/cli.h: No such file). (Johannes) + - Reflection: . Implemented FR #61602 (Allow access to name of constant used as default value). (reeze@gmail.com) diff --git a/sapi/cli/config.m4 b/sapi/cli/config.m4 index 77fc5e9..cdfa1f7 100644 --- a/sapi/cli/config.m4 +++ b/sapi/cli/config.m4 @@ -44,5 +44,7 @@ if test $PHP_CLI != no; then PHP_SUBST(BUILD_CLI) PHP_OUTPUT(sapi/cli/php.1) + + PHP_INSTALL_HEADERS([sapi/cli/cli.h]) fi AC_MSG_RESULT($PHP_CLI) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
