From: Xinchen Hui <laruence@php.net>
Date: Tue, 1 Nov 2011 13:06:41 +0000 (+0000)
Subject: Fixed bug  #60189 (php logo can not be displayed)
X-Git-Tag: php-5.4.0RC1~50
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ceac9dc4902795ee615d9e089a29434bd77c4cdb;p=php

Fixed bug  #60189 (php logo can not be displayed)
---

diff --git a/NEWS b/NEWS
index 67fee7d25c..f1ee37e18d 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ PHP                                                                        NEWS
   . Fixed bug #60115 (memory definitely lost in cli server). (Laruence)
   . Fixed bug #60146 (Last 2 lines of page not being output). (Laruence)
   . Fixed bug #60180 ($_SERVER["PHP_SELF"] incorrect). (Laruence)
+  . Fixed bug #60189 (php logo can not be displayed). (Laruence)
 
 - Core:
   . Fixed bug #60120 (proc_open's streams may hang with stdin/out/err when 
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index 67df608672..597efc8e63 100644
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@ -1931,7 +1931,7 @@ static int php_cli_server_dispatch_router(php_cli_server *server, php_cli_server
 		destroy_request_info(&SG(request_info));
 		return -1;
 	}
-	{
+	if (!php_handle_special_queries(TSRMLS_C)) {
 		zend_file_handle zfd;
 		char *old_cwd;
 
diff --git a/sapi/cli/tests/php_cli_server_011.phpt b/sapi/cli/tests/php_cli_server_011.phpt
new file mode 100644
index 0000000000..a957a8ed4c
--- /dev/null
+++ b/sapi/cli/tests/php_cli_server_011.phpt
@@ -0,0 +1,41 @@
+--TEST--
+Bug #60180 ($_SERVER["PHP_SELF"] incorrect)
+--SKIPIF--
+<?php
+include "skipif.inc"; 
+?>
+--FILE--
+<?php
+include "php_cli_server.inc";
+php_cli_server_start('sytanx error;', TRUE);
+
+list($host, $port) = explode(':', PHP_CLI_SERVER_ADDRESS);
+$port = intval($port)?:80;
+
+$fp = fsockopen($host, $port, $errno, $errstr, 0.5);
+if (!$fp) {
+  die("connect failed");
+}
+
+$logo_id = php_logo_guid();
+
+if(fwrite($fp, <<<HEADER
+GET /?={$logo_id} HTTP/1.1
+Host: {$host}
+
+
+HEADER
+)) {
+	while (!feof($fp)) {
+		if (("Content-Type: image/gif") ==  trim(fgets($fp))) {
+			echo "okey";
+			break;
+		}
+	}
+}
+
+fclose($fp);
+
+?>
+--EXPECTF--
+okey