laruence                                 Sun, 23 Oct 2011 03:02:24 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=318333

Log:
fix memory leak

Changed paths:
    U   php/php-src/branches/PHP_5_4/NEWS
    U   php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c
    U   php/php-src/trunk/sapi/cli/php_cli_server.c

Modified: php/php-src/branches/PHP_5_4/NEWS
===================================================================
--- php/php-src/branches/PHP_5_4/NEWS   2011-10-23 02:54:06 UTC (rev 318332)
+++ php/php-src/branches/PHP_5_4/NEWS   2011-10-23 03:02:24 UTC (rev 318333)
@@ -3,9 +3,11 @@
 ?? ??? 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:

Modified: php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c      2011-10-23 
02:54:06 UTC (rev 318332)
+++ php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c      2011-10-23 
03:02:24 UTC (rev 318333)
@@ -1787,6 +1787,9 @@

        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;


Modified: php/php-src/trunk/sapi/cli/php_cli_server.c
===================================================================
--- php/php-src/trunk/sapi/cli/php_cli_server.c 2011-10-23 02:54:06 UTC (rev 
318332)
+++ php/php-src/trunk/sapi/cli/php_cli_server.c 2011-10-23 03:02:24 UTC (rev 
318333)
@@ -1787,6 +1787,9 @@

        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;


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to