summaryrefslogtreecommitdiff
path: root/sapi
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2013-12-27 20:46:08 +0800
committerXinchen Hui <laruence@php.net>2013-12-27 20:46:08 +0800
commitfb4678f1acebca1d06b6689a7edb60509de010a0 (patch)
treedb1cf6640ca4065a5d39cc125d7261a0bfcc4af9 /sapi
parentc0476ff44bc382825cdd5d2a27697b43424aebdf (diff)
parenta8cd9b417c1195075657ebaf99d792f4e92b99ac (diff)
downloadphp-git-fb4678f1acebca1d06b6689a7edb60509de010a0.tar.gz
Merge branch 'PHP-5.6'
Diffstat (limited to 'sapi')
-rw-r--r--sapi/fpm/fpm/fpm_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
index e1c8ff081a..b3e9685eb6 100644
--- a/sapi/fpm/fpm/fpm_main.c
+++ b/sapi/fpm/fpm/fpm_main.c
@@ -1353,7 +1353,7 @@ static void init_request_info(TSRMLS_D)
} else {
SG(request_info).request_uri = env_script_name;
}
- free(real_path);
+ efree(real_path);
}
} else {
/* pre 4.3 behaviour, shouldn't be used but provides BC */