fix memory leak

diff --git a/NEWS b/NEWS
index 916eba0348cfbb1851fef33199eb6fe6f9a795db..3881b9fce5464e23c6c196e98c6e2b3a435ead54 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,9 +3,11 @@ PHP                                                                        NEWS
 ?? ??? 2011, PHP 5.4.0 RC1
 - General improvements:
   . Changed silent conversion of array to string to produce a notice. (Patrick)
+
 - CLI SAPI:
   . Fixed bug #60112 (If URI does not contain a file, index.php is not served)
     .(Laruence)
+  . Fixed bug #60115 (memory definitely lost in cli server). (Laruence)
 
 20 Oct 2011, PHP 5.4.0 beta2
 - General improvements:

diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index 52e77db8212365c7f8258ca5a159fe92aa8d695e..aaa17df17e37f57db5c540d4e438fe355e462824 100644 (file)
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@ -1787,6 +1787,9 @@ static int php_cli_server_send_error_page(php_cli_server *server, php_cli_server
 
        php_cli_server_log_response(client, status, errstr ? errstr : "?" TSRMLS_CC);
        php_cli_server_poller_add(&server->poller, POLLOUT, client->sock);
+       if (errstr) {
+               pefree(errstr, 1);
+       }
        efree(escaped_request_uri);
        return SUCCESS;