laruence                                 Mon, 24 Oct 2011 03:47:42 +0000

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

Log:
A better fix, sorry for previous thoughtlessness commit.

Changed paths:
    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/sapi/cli/php_cli_server.c
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c      2011-10-24 
03:28:59 UTC (rev 318355)
+++ php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c      2011-10-24 
03:47:42 UTC (rev 318356)
@@ -1292,14 +1292,10 @@
                                        }
                                        file++;
                                }
-                               if (!*file) {
+                               if (!*file || is_static_file) {
                                        pefree(buf, 1);
                                        return;
                                }
-                               if (is_static_file) {
-                                       pefree(buf, 1);
-                                       return;
-                               }
                        }
                        break; /* regular file */
                }

Modified: php/php-src/trunk/sapi/cli/php_cli_server.c
===================================================================
--- php/php-src/trunk/sapi/cli/php_cli_server.c 2011-10-24 03:28:59 UTC (rev 
318355)
+++ php/php-src/trunk/sapi/cli/php_cli_server.c 2011-10-24 03:47:42 UTC (rev 
318356)
@@ -1292,14 +1292,10 @@
                                        }
                                        file++;
                                }
-                               if (!*file) {
+                               if (!*file || is_static_file) {
                                        pefree(buf, 1);
                                        return;
                                }
-                               if (is_static_file) {
-                                       pefree(buf, 1);
-                                       return;
-                               }
                        }
                        break; /* regular file */
                }

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

Reply via email to