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

diff --git a/sapi/fpm/fpm/fpm_request.c b/sapi/fpm/fpm/fpm_request.c
index de3caf7daf19ce04a8a157dc57c07377dc460ea0..1e8016005a3f5e3fdcb82f244d604fda8aa8b193 100644 (file)
--- 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);