Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #55438 (Curlwapper is not sending http header randomly)

diff --cc NEWS
index 2a8660e25db5ea2669441c490e9b88d331a41271,bb3a7df4704b1354690324e3dc20c76d38bcff66..81bc7a683842aa32b34d02520691eab719274f3a
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,25 -1,20 +1,29 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2013, PHP 5.3.21
 +?? ??? 2012, PHP 5.4.11
  
 -- Zend Engine:
 -  . Fixed bug #63762 (Sigsegv when Exception::$trace is changed by user).
 -    (Johannes)
 +- Filter:
 +  . Fixed bug #63757 (getenv() produces memory leak with CGI SAPI). (Dmitry)
 +
 +- JSON:
 +  . Fixed bug #63737 (json_decode does not properly decode with options
 +    parameter). (Adam)
 +
 +- CLI server
 +  . Update list of common mime types. Added webm, ogv, ogg. (Lars,
 +    pascalc at gmail dot com)
  
 -20 Dec 2012, PHP 5.3.20
+ - cURL extension:
+   . Fixed bug #55438 (Curlwapper is not sending http header randomly).
+     (phpnet@lostreality.org, Pierrick)
+ 
 +?? ??? 2012, PHP 5.4.10
  
 -- Zend Engine:
 +- Core:
 +  . Fixed bug #63726 (Memleak with static properties and internal/user
 +    classes). (Laruence)
    . Fixed bug #63635 (Segfault in gc_collect_cycles). (Dmitry)
 -  . Fixed bug #63512 (parse_ini_file() with INI_SCANNER_RAW removes quotes 
 +  . Fixed bug #63512 (parse_ini_file() with INI_SCANNER_RAW removes quotes
      from value). (Pierrick)
    . Fixed bug #63468 (wrong called method as callback with inheritance).
      (Laruence)

diff --cc ext/curl/streams.c
Simple merge