]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c5e5a6c 8f4a6d6)
Merge branch 'PHP-5.4' into PHP-5.5
authorRasmus Lerdorf <rasmus@lerdorf.com>
Sun, 20 Oct 2013 16:37:25 +0000 (09:37 -0700)
committerRasmus Lerdorf <rasmus@lerdorf.com>
Sun, 20 Oct 2013 16:37:25 +0000 (09:37 -0700)
* PHP-5.4:
  Clean up this weird safe_emalloc() call

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

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