diff options
| author | Remi Collet <remi@php.net> | 2013-11-04 13:23:36 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2013-11-04 13:23:36 +0100 |
| commit | 5dc37b351085a7b8cdc30ef2ebb349c8e5df4e2c (patch) | |
| tree | 33357220b91d8553c0978e6392385e0fb8e49028 /ext/zip/zip_stream.c | |
| parent | 2f555b8e606b5f09d635cef4d3fcbcd6939adae2 (diff) | |
| download | php-git-5dc37b351085a7b8cdc30ef2ebb349c8e5df4e2c.tar.gz | |
Sync ext/zip with pecl/zip version 1.3.2
- update libzip to version 1.11.1. We don't use any private symbol anymore
- new method ZipArchive::setPassword($password)
- add --with-libzip option to build with system libzip
Diffstat (limited to 'ext/zip/zip_stream.c')
| -rw-r--r-- | ext/zip/zip_stream.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/ext/zip/zip_stream.c b/ext/zip/zip_stream.c index 79b54cbbb0..02fbc70f85 100644 --- a/ext/zip/zip_stream.c +++ b/ext/zip/zip_stream.c @@ -1,3 +1,21 @@ +/* + +----------------------------------------------------------------------+ + | PHP Version 5 | + +----------------------------------------------------------------------+ + | Copyright (c) 1997-2013 The PHP Group | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.01 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available through the world-wide-web at the following url: | + | http://www.php.net/license/3_01.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Author: Piere-Alain Joye <pierre@php.net> | + +----------------------------------------------------------------------+ +*/ + /* $Id$ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -6,8 +24,6 @@ #if HAVE_ZIP #ifdef ZEND_ENGINE_2 -#include "lib/zip.h" - #include "php_streams.h" #include "ext/standard/file.h" #include "ext/standard/php_string.h" |