[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/zip/php_zip.c

2013-10-20 Thread Felipe Pena
Commit:8aa19c9fd8bcccd76d5246064fd4eab4e4b5c4f2
Author:Felipe Pena felipe...@gmail.com Sun, 20 Oct 2013 09:50:13 
-0200
Parents:   5b0560efc3e803cdb59d161cb3cd660e388b211f 
9976b5cd7f36d90b49d1dcf58ec6497f0e592b7d
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=8aa19c9fd8bcccd76d5246064fd4eab4e4b5c4f2

Log:
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Moved NULL check before dereferencing

Changed paths:
  MM  ext/zip/php_zip.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/zip/php_zip.c

2013-04-10 Thread Anatol Belski
Commit:0655ab7c261840d8068c7360af5cda5351cffc22
Author:Anatol Belski a...@php.net Wed, 10 Apr 2013 20:45:28 +0200
Parents:   af967de2afc584c602c0b6d4d6731e411323d94e 
782085bbfbb6fff07c59b3528285bc619ee5847b
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=0655ab7c261840d8068c7360af5cda5351cffc22

Log:
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated NEWS
  Fixed bug #64342 ZipArchive::addFile() has to check for file existence

Bugs:
https://bugs.php.net/64342

Changed paths:
  MM  ext/zip/php_zip.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php