]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2379ec4 345f6d9)
Merge branch 'PHP-5.4' into PHP-5.5
authorFelipe Pena <felipensp@gmail.com>
Sat, 10 May 2014 14:53:45 +0000 (11:53 -0300)
committerFelipe Pena <felipensp@gmail.com>
Sat, 10 May 2014 14:53:45 +0000 (11:53 -0300)
* PHP-5.4:
  - Fixed missing NULL check in SimpleXMLElement::xpath()

1  2 
ext/simplexml/simplexml.c patch | diff1 | diff2 | blob | history

diff --cc ext/simplexml/simplexml.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.