Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix typo

Author: rlerdorf

sapi/fpm/fpm/fastcgi.c

@@ -428,7 +428,7 @@ static int fcgi_get_params(fcgi_request *req, unsigned char *p, unsigned char *e
 	size_t buf_size = sizeof(buf);
 	int name_len = 0;
 	int val_len = 0;
-	uint eff_name_lenk = 0;
+	uint eff_name_len = 0;
 	char *s;
 	int ret = 1;
 	size_t bytes_consumed;