Commit:    5ebdc46aa067359a34ed7e333e4640dc243ccb28
Author:    Anatoliy Belsky <a...@php.net>         Thu, 7 Jun 2012 21:06:31 +0200
Parents:   78811586901e08e284120edf43c53c78451e4f91 
bde0e8c2a14944016d9dbd0653b74e9e2b75c965
Branches:  PHP-5.4 master

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

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

* PHP-5.3:
  zip windows fixes
  fixed bc break related to #57905
  fixed a bit overlooked from the last libzip port
  brought the fix for #47667 back
  fixed zip entry freeing
  rechecked the merged libzip, took also the indents from the original to avoid 
confusion next time
  fixed a double freeing crash
  fixed header include
  initial libzip upgrade patch to 0.10.1
  - BFN

Conflicts:
        NEWS

Bugs:
https://bugs.php.net/57905
https://bugs.php.net/47667

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

Reply via email to