php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 18:23:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
105,365 Commits 549 Branches 1,485 Tags
b84cbefa940bef25cfb464c2d99f03ebcb611e25
Commit Graph

532 Commits

Author SHA1 Message Date
Anatol Belski bf43ab53ae Merge branch 'PHP-7.2' 
* PHP-7.2:
  Apply upstream patch for CVE-2017-14107
  Backport and apply upstream patch for CVE-2017-14107
 2017-10-27 14:18:55 +02:00
Anatol Belski 40f76c9f0c Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Apply upstream patch for CVE-2017-14107
  Backport and apply upstream patch for CVE-2017-14107
 2017-10-27 14:18:27 +02:00
Anatol Belski 211dacd7b5 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Apply upstream patch for CVE-2017-14107
  Backport and apply upstream patch for CVE-2017-14107
 2017-10-27 14:17:57 +02:00
Anatol Belski 10dc1950f7 Apply upstream patch for CVE-2017-14107 2017-10-27 13:20:15 +02:00
Remi Collet 8857161bf2 Use system libzip by default 
Use --without-libzip in travis, as libzip version available there
is too old (0.10, while 0.11 is required, 1.3.0 is best)

The real plan is to really drop bundled libzip... delayed.
Notice: only system library have full features:
* encryption
* bzip support
 2017-09-11 09:23:01 +02:00
Remi Collet 9ecafd9788 Revert "drop support for bundled libzip (linux)" 
This reverts commit 7104203328.
 2017-09-07 15:17:28 +02:00
Anatol Belski 757789ef4b remove bundled libzip config for .w32 2017-09-07 15:16:12 +02:00
Remi Collet 7104203328 drop support for bundled libzip (linux) 2017-09-07 14:28:05 +02:00
Remi Collet 1830e3c43c Merge branch 'PHP-7.2' 
* PHP-7.2:
  improve warn (bzip2 requires libzip >= 1.3.0)
 2017-09-04 14:47:14 +02:00
Remi Collet 5bbd459609 improve warn (bzip2 requires libzip >= 1.3.0) 2017-09-04 14:47:03 +02:00
Anatol Belski 619b493698 Merge branch 'PHP-7.2' 
* PHP-7.2:
  libzip 1.3.0 supports also bz2 compression
 2017-09-04 13:28:34 +02:00
Anatol Belski b971087354 libzip 1.3.0 supports also bz2 compression 2017-09-04 13:27:53 +02:00
Anatol Belski fcb6e0afe1 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug #75143 new method setEncryptionName() seems not to exist in ZipArchive
 2017-09-01 10:53:50 +02:00
Anatol Belski a6456f0a6c Fixed bug #75143 new method setEncryptionName() seems not to exist in ZipArchive 
update NEWS
 2017-09-01 10:53:09 +02:00
Anatol Belski 49d9b3013f Move cwd_state and path related routines to size_t 
Having `int` there is no real profit in the size or speed, while unsigned
improves security and overall integration. ZPP supplied strings can
be then accepted directly and structs can be still handled with smaller
unsigned types for size reasons, which is safe. Yet some related places
are to go.

basic move tsrm_realpath_r to size_t

fix conditions and sync with affected places

touch ocurrences of php_sys_readlink usage

follow up on phar path handling

remove duplicated check

move zend_resolve_path and related pieces to size_t

touch yet resolve path related places

remove cast

missing pieces

missing piece

yet cleanups for php_sys_readlink for ssize_t

fix wrong return
 2017-07-27 20:11:21 +02:00
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