Commit Graph

517 Commits

Author SHA1 Message Date
Remi Collet
2458dce3e5 Fix segfault in php_stream_context_get_option call 2017-07-11 11:41:47 +02:00
Remi Collet
569d164c4a ZipArchive implements countable, added ZipArchive::count() method 2017-07-10 11:31:55 +02:00
Tom Van Looy
04fb3f28ff Remove superfluous semicolons 2017-06-26 00:23:25 +02:00
Remi Collet
75cda24b82 cleanup
ssite_t is used in lot of places, without need for this.
If really needed, should be in global location, not in an extension
2017-06-09 09:22:05 +02:00
Remi Collet
b54e0dc321 clean 2017-05-31 09:57:34 +02:00
Remi Collet
77cca632da Use of bundled libzip is deprecated 2017-05-31 09:56:01 +02:00
Remi Collet
67136fe77b zip ext is 1.14.0 2017-04-05 07:39:39 +02:00
Anatol Belski
3c750d91ee external libzip neither requires zlib.h nor lib 2017-04-04 16:33:20 +02:00
Remi Collet
908029bbc0 Fixed Bug #73803 Reflection of ZipArchive does not show public properties 2017-03-21 11:15:45 +01:00
Anatol Belski
42821dd1c9 basic support for external libzip 2017-03-19 23:11:19 +01:00
Remi Collet
402eeb8598 Zip: add support for encrypted archive 2017-03-02 13:36:40 +01:00
Remi Collet
f6fc9aa1b1 Merge branch 'PHP-7.1'
* PHP-7.1:
  make type consistent with glob_t.gl_pathc
2017-03-01 17:03:11 +01:00
Remi Collet
2f955d5d0a Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  make type consistent with glob_t.gl_pathc
2017-03-01 17:02:42 +01:00
Remi Collet
53a08fd07d make type consistent with glob_t.gl_pathc 2017-03-01 17:01:58 +01:00
Remi Collet
8f8fb92cd0 Merge branch 'PHP-7.1'
* PHP-7.1:
  fix test for libzip 1.2.0
2017-02-19 17:02:31 +01:00
Remi Collet
dd9701c414 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix test for libzip 1.2.0
2017-02-19 17:02:16 +01:00
Remi Collet
c836ad1c7e fix test for libzip 1.2.0 2017-02-19 17:02:00 +01:00
Stanislav Malyshev
540e672868 Merge branch 'PHP-7.1'
* PHP-7.1:
  Update more functions with path check
2017-01-15 17:33:48 -08:00
Stanislav Malyshev
19e80ef496 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Update more functions with path check
2017-01-15 17:32:37 -08:00
Stanislav Malyshev
43d0f2abc5 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Update more functions with path check
2017-01-15 17:32:26 -08:00
Stanislav Malyshev
0ab1af7d3e Update more functions with path check 2017-01-15 17:31:08 -08:00
Christoph M. Becker
94c6460b85 Merge branch 'PHP-7.1'
* PHP-7.1:
  Fix #70103: Fix bug 70103 when ZTS is enabled
2017-01-06 15:45:44 +01:00
Christoph M. Becker
cc75e8bca5 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix #70103: Fix bug 70103 when ZTS is enabled
2017-01-06 15:44:31 +01:00
Mitch Hagstrand
ad08aa3956 Fix #70103: Fix bug 70103 when ZTS is enabled
Used snprintf to copy the basename string before it is freed
2017-01-06 15:26:17 +01:00
Joe Watkins
1db0569514
Merge branch 'PHP-7.1'
* PHP-7.1:
  Fix #70103: ZipArchive::addGlob ignores remove_all_path option
  news entry for PR #1430
2017-01-06 05:41:40 +00:00
Joe Watkins
3f89aec716
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix #70103: ZipArchive::addGlob ignores remove_all_path option
  news entry for PR #1430
2017-01-06 05:40:41 +00:00
Joe Watkins
a49aaf9ab0
Merge branch 'pull-request/1430' into PHP-7.0
* pull-request/1430:
  Fix #70103: ZipArchive::addGlob ignores remove_all_path option
  news entry for PR 1430
2017-01-06 05:39:48 +00:00
Sammy Kaye Powers
dac6c639bb Update copyright headers to 2017 2017-01-04 11:23:42 -06:00
Sammy Kaye Powers
478f119ab9 Update copyright headers to 2017 2017-01-04 11:14:55 -06:00
Sammy Kaye Powers
9e29f841ce Update copyright headers to 2017 2017-01-02 09:30:12 -06:00
Anatol Belski
bd7fafb642 fix typo 2016-12-13 13:39:07 +01:00
Anatol Belski
12c51c2f9a check for header availability 2016-12-13 13:22:09 +01:00
Sara Golemon
613ee726a8 Include unistd.h for getpid() 2016-12-12 23:25:49 -08:00
Anatol Belski
b204b3abd1 further normalizations, uint vs uint32_t
fix merge mistake

yet one more replacement run
2016-11-26 17:29:01 +01:00
Tom Van Looy
442fd2f92a Cleanup tests version checks 2016-11-20 14:16:50 +01:00
Stanislav Malyshev
25d04ad8e3 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Add length check for bzcompress too - fix for bug #73356
  More string length checks & fixes
  More string length checks & fixes
2016-11-03 22:53:05 -07:00
Stanislav Malyshev
1fd18821e0 More string length checks & fixes 2016-11-03 21:35:09 -07:00
Stanislav Malyshev
6e12e49b5b Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  More string length checks & fixes
2016-11-03 20:46:25 -07:00
Stanislav Malyshev
ea9fac94bb More string length checks & fixes 2016-11-03 20:36:52 -07:00
Remi Collet
20b1029e4c Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  bump ext/zip version
2016-10-14 17:31:26 +02:00
Remi Collet
f1cf340e19 bump ext/zip version 2016-10-14 17:31:07 +02:00
Christoph M. Becker
1928cdcacb Merge branch 'PHP-7.0' into PHP-7.1 2016-09-06 01:18:22 +02:00
Christoph M. Becker
81ec843d0e Merge branch 'PHP-5.6' into PHP-7.0 2016-09-06 01:15:36 +02:00
Christoph M. Becker
8aad3131a1 Fix #70752: Depacking with wrong password leaves 0 length files
We should not open the output stream before we have tried to open the
archive entry, as failing the latter could leave an empty file behind.
2016-09-06 01:03:46 +02:00
Christoph M. Becker
f7d4733b2e Merge branch 'PHP-7.0' into PHP-7.1 2016-08-17 12:49:00 +02:00
Christoph M. Becker
356b586ec1 Merge branch 'PHP-5.6' into PHP-7.0 2016-08-17 12:47:06 +02:00
Christoph M. Becker
48198e4c25 Fix #68302: impossible to compile php with zip support
We should not let configure succeed, if SIZEOF_OFF_T == 0, just to let the
compilation fail later. Instead we bail out early, giving a hint regarding
the potential issue, namely misconfigured libraries.
2016-08-17 12:43:29 +02:00
Xinchen Hui
393d56f1e3 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed bug #72660 (NULL Pointer dereference in zend_virtual_cwd)
2016-07-24 23:58:50 +08:00
Xinchen Hui
ad96a052d9 Fixed bug #72660 (NULL Pointer dereference in zend_virtual_cwd) 2016-07-24 23:58:22 +08:00
Remi Collet
a2a122804e bump zip extension version 2016-07-21 08:44:26 +02:00