]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5b0560e 9976b5c)
Merge branch 'PHP-5.4' into PHP-5.5
authorFelipe Pena <felipensp@gmail.com>
Sun, 20 Oct 2013 11:50:13 +0000 (09:50 -0200)
committerFelipe Pena <felipensp@gmail.com>
Sun, 20 Oct 2013 11:50:13 +0000 (09:50 -0200)
* PHP-5.4:
  - Moved NULL check before dereferencing

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

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