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

2013-10-20 Thread Felipe Pena 
Commit:048923b3c6bec8a7aed97015e8a3597ae1898b3d
Author:Felipe Pena felipe...@gmail.com Sun, 20 Oct 2013 09:50:17 
-0200
Parents:   d23f089fb94b8a3fec07d58a6801fe078c32dd3e 
8aa19c9fd8bcccd76d5246064fd4eab4e4b5c4f2
Branches:  master

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

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  - 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.5': ext/zip/php_zip.c

2013-04-10 Thread Anatol Belski 
Commit:9386ba9e97fc935c6a120670b333843c20033882
Author:Anatol Belski a...@php.net Wed, 10 Apr 2013 20:47:55 +0200
Parents:   fd15a711841e6cd86e59c43ca85eea169e1c7ec5 
fc658f442da3efc77bc811a4976ab3465e758959
Branches:  master

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

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  update NEWS
  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