From: Adam Harvey <aharvey@php.net>
Date: Fri, 2 May 2014 17:25:42 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~318^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fbb0c4b8001bb6b57164d00337725aae9291cf44;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix author name on the #63228 patch.
---

fbb0c4b8001bb6b57164d00337725aae9291cf44
diff --cc NEWS
index d0ce2f1940,457b1e8c1b..9b4f4e9781
--- a/NEWS
+++ b/NEWS
@@@ -66,12 -73,9 +66,12 @@@ PH
  - LDAP:
    . Fixed issue with null bytes in LDAP bindings. (Matthew Daley)
  
 -- mysqli:
 -  . Fixed problem in mysqli_commit()/mysqli_rollback() with second parameter
 -    (extra comma) and third parameters (lack of escaping). (Andrey)
 +- litespeed
 +  . Fixed bug #63228 (-Werror=format-security error in lsapi code).
-     (George Wang)
++    (Elan Ruusamäe, George)
 +
 +- mysqlnd:
 +  . Added a new fetching mode to mysqlnd. (Andrey)
  
  - OpenSSL:
    . Fix bug #66942 (memory leak in openssl_seal()). (Chuan Ma)