Commit:    c3b0fb4fbe20e46266a792cb1f332d08ef40923b
Author:    Felipe Pena <felipe...@gmail.com>         Thu, 19 Apr 2012 23:12:47 
-0300
Parents:   5cbf2d678505b6e4ab89bcfe04695e5da9dd2c0e
Branches:  PHP-5.3 PHP-5.4 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=c3b0fb4fbe20e46266a792cb1f332d08ef40923b

Log:
- Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename set 
to null) patch by a...@php.net

Bugs:
https://bugs.php.net/54197

Changed paths:
  M  sapi/cgi/cgi_main.c


Diff:
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index dfd77e4..56c736f 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -848,12 +848,13 @@ static int sapi_cgi_activate(TSRMLS_D)
                                zend_str_tolower(doc_root, doc_root_len);
 #endif
                                php_cgi_ini_activate_user_config(path, 
path_len, doc_root, doc_root_len, doc_root_len - 1 TSRMLS_CC);
+                               
+#ifdef PHP_WIN32
+                               efree(doc_root);
+#endif
                        }
                }
 
-#ifdef PHP_WIN32
-               efree(doc_root);
-#endif
                efree(path);
        }


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

Reply via email to