com php-src: Improve error message for ssl request: sapi/cli/php_cli_server.c

From:	Xinchen Hui	Date:	Sun, 22 Jul 2012 11:20:23 +0000
Subject:	com php-src: Improve error message for ssl request: sapi/cli/php_cli_server.c
Groups:	php.cvs
Request:	Send a blank email to [email protected] to get a copy of this message

Commit:    a88eca53f708602384cae147a8376352d5909d90
Author:    Xinchen Hui <[email protected]>         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) {



   

Thread (1 message)

• Xinchen HuiSun, 22 Jul 2012 11:20:23 +0000