From: Adam Harvey <aharvey@php.net>
Date: Tue, 1 Jul 2014 20:25:55 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~143^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d1adf55c15eec332984fb70de2dabc9704337719;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix ext/pgsql builds with libpq < 7.3.
---

d1adf55c15eec332984fb70de2dabc9704337719
diff --cc NEWS
index 2321470043,10634a1ab3..0bde29e449
--- a/NEWS
+++ b/NEWS
@@@ -10,29 -10,24 +10,33 @@@ PH
    . Fixed bug #67091 (make install fails to install libphp5.so on FreeBSD 10.0).
      (Ferenc)
  
 -- CLI server:
 -  . Implemented FR #67429 (CLI server is missing some new HTTP response codes).
 -    (Adam)
 -
  - FPM:
    . Fix bug #67531 (syslog cannot be set in pool configuration). (Remi)
 +  . Fix bug #67541 (Fix Apache 2.4.10+ SetHandler proxy:fcgi://
 +    incompatibilities). (David Zuelke)
  
+ - pgsql:
+   . Fix bug #67550 (Error in code "form" instead of "from", pgsql.c, line 756),
+     which affected builds against libpq < 7.3. (Adam)
+ 
 -- Streams:
 -  . Fixed bug #67430 (http:// wrapper doesn't follow 308 redirects). (Adam)
 +- phpdbg:
 +  . Fix Bug #67499 (readline feature not enabled when build with libedit). (Remi)
 +  . Fix issue krakjoe/phpdbg#94 (List behavior is inconsistent). (Bob)
 +  . Fix issue krakjoe/phpdbg#97 (The prompt should always ensure it is on a
 +    newline). (Bob)
 +  . Fix issue krakjoe/phpdbg#98 (break if does not seem to work). (Bob)
 +  . Fix issue krakjoe/phpdbg#99 (register function has the same behavior as
 +    run). (Bob)
 +  . Fix issue krakjoe/phpdbg#100 (No way to list the current stack/frames)
 +    (Help entry was missing). (Bob)
  
 -?? ??? 2014, PHP 5.5.14
 +19 Jun 2014, PHP 5.6.0 Release Candidate 1
  
  - Core:
 -  . Fixed BC break introduced by patch for bug #67072. (Anatol, Stas)
 +  . Implemented FR #64744 (Differentiate between member function call on a null 
 +    and non-null, non-objects). (Boro Sitnikovski)
 +  . Fixed bug #67436 (Autoloader isn't called if two method definitions don't
 +    match). (Bob)
    . Fixed bug #66622 (Closures do not correctly capture the late bound class
      (static::) in some cases). (Levi Morrison)
    . Fixed bug #67390 (insecure temporary file use in the configure script).