From: Michael Wallner <mike@php.net>
Date: Fri, 12 Jun 2015 08:49:15 +0000 (+0200)
Subject: fix bad merge; keys were serialized twice
X-Git-Tag: RELEASE_3_0_0_RC1~48
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=6116c2d8303b5301d927083af4dc763f952ab3ea;p=m6w6%2Fext-http

fix bad merge; keys were serialized twice
---

diff --git a/php_http_params.c b/php_http_params.c
index ced2507..a30610d 100644
--- a/php_http_params.c
+++ b/php_http_params.c
@@ -904,7 +904,6 @@ static void shift_param(php_http_buffer_t *buf, char *key_str, size_t key_len, z
 			shift_arg(buf, key_str, key_len, zvalue, ass, asl, vss, vsl, flags);
 		}
 	} else {
-		shift_key(buf, key_str, key_len, pss, psl, flags);
 		if (flags & PHP_HTTP_PARAMS_RFC5988) {
 			shift_rfc5988(buf, key_str, key_len, pss, psl, flags);
 		} else {