diff options
| author | Felipe Pena <felipensp@gmail.com> | 2012-04-19 23:13:37 -0300 |
|---|---|---|
| committer | Felipe Pena <felipensp@gmail.com> | 2012-04-19 23:13:37 -0300 |
| commit | d2798c6035faf1e2497a26964cb4b9672017e8d9 (patch) | |
| tree | f95b2d37fac860cf27039ed651f585178b0e268d | |
| parent | 0a46d63f7e763c28c61773239c3173b0c0f26309 (diff) | |
| parent | c3b0fb4fbe20e46266a792cb1f332d08ef40923b (diff) | |
| download | php-git-d2798c6035faf1e2497a26964cb4b9672017e8d9.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
- Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename set to null) patch by ab@php.net
| -rw-r--r-- | sapi/cgi/cgi_main.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 1e403870c3..d9c3181cf4 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -892,12 +892,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); } |