summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Wallner <mike@php.net>2015-01-30 23:01:26 +0100
committerMichael Wallner <mike@php.net>2015-01-30 23:01:26 +0100
commitc0477fbcb5a0a5e3656c143d4615133b287373a5 (patch)
tree3ba9e0f07f047bc3f8173fb68b1ff3c770176c17
parent3c4540dec91ed57f0832bfd7c82bfde93a231369 (diff)
downloadphp-git-c0477fbcb5a0a5e3656c143d4615133b287373a5.tar.gz
Squashed commit of the following:
commit 5cee14b14b6627a23b9b6c5f9258ec1728b28ec5 Merge: 6392e1e 59593ba Author: Shafreeck Sea <renenglish@gmail.com> Date: Tue Jan 27 19:15:48 2015 +0800 Merge branch 'master' of git://github.com/php/php-src commit 6392e1e86a3ff97565d5941b819de4c776fc2390 Author: Shafreeck Sea <renenglish@gmail.com> Date: Tue Jan 27 11:32:04 2015 +0800 Remove duplicated line
-rw-r--r--sapi/fpm/fpm/fpm_request.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sapi/fpm/fpm/fpm_request.c b/sapi/fpm/fpm/fpm_request.c
index de3caf7daf..1e8016005a 100644
--- a/sapi/fpm/fpm/fpm_request.c
+++ b/sapi/fpm/fpm/fpm_request.c
@@ -92,7 +92,6 @@ void fpm_request_reading_headers() /* {{{ */
proc->request_method[0] = '\0';
proc->script_filename[0] = '\0';
proc->query_string[0] = '\0';
- proc->query_string[0] = '\0';
proc->auth_user[0] = '\0';
proc->content_length = 0;
fpm_scoreboard_proc_release(proc);