summaryrefslogtreecommitdiff
path: root/ext/zlib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-07-041-1/+1
|\
| * Fix typo in commentChristoph M. Becker2016-07-041-1/+1
| |
* | Move semicolon into TSRMLS_CACHE_EXTERN/DEFINENikita Popov2016-03-031-1/+1
| | | | | | | | Also re bug #71575.
* | Format string fixesNikita Popov2016-02-141-1/+1
| | | | | | | | | | Conflicts: ext/pgsql/pgsql.c
* | Merge branch 'PHP-5.6.18' into PHP-7.0.3Stanislav Malyshev2016-02-011-10/+10
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6.18: fix tests fix NEWS Update NEWS update NEWS Fixed bug #71488: Stack overflow when decompressing tar archives update NEWS add missing headers for SIZE_MAX backport the escapeshell* functions hardening branch add tests Fix bug #71459 - Integer overflow in iptcembed() prepare 5.6.18RC1 Fix test when run with openssl < 1.0.2 (reorder so no more SSLv2 message) Fix skip message to work improve fix for bug #71201 Fixed bug #71323 - Output of stream_get_meta_data can be falsified by its input Fix bug #71391: NULL Pointer Dereference in phar_tar_setupmetadata() Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream() Fix bug #71335: Type Confusion in WDDX Packet Deserialization Fix bug #71354 - remove UMR when size is 0 Conflicts: configure.in ext/phar/dirstream.c ext/phar/phar_object.c ext/phar/tar.c ext/standard/exec.c ext/standard/iptc.c ext/standard/math.c ext/standard/streamsfuncs.c ext/wddx/wddx.c main/php_version.h main/streams/memory.c
| * Merge branch 'PHP-5.5' into PHP-5.6.18Stanislav Malyshev2016-02-011-10/+10
| |\ | | | | | | | | | | | | | | | | | | * PHP-5.5: fix tests fix NEWS update NEWS
| | * fix testsStanislav Malyshev2016-02-011-10/+10
| | |
* | | Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-014-4/+4
|\ \ \ | |/ / | | | | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016)
| * | Happy new year (Update copyright to 2016)Lior Kaplan2016-01-014-4/+4
| | |
* | | added test for gzgetss()marcosptf2015-08-233-0/+27
| | |
* | | Removed dead codeJulien Pauli2015-08-171-2/+0
| | |
* | | switch to the unified globals accessor where appropriateAnatol Belski2015-07-291-7/+2
| | |
* | | Fix zlib_filter warningsNikita Popov2015-07-171-6/+10
| | |
* | | Use ZSTR_ API to access zend_string elements (this is just renaming without ↵Dmitry Stogov2015-06-301-32/+32
| | | | | | | | | | | | semantick changes).
* | | Remove these old references to the DSP files we don't use anymoreKalle Sommer Nielsen2015-06-221-1/+0
| | |
* | | Add support for string dictionaries, fix array dictionaries ({de,in}flate)Bob Weinand2015-05-212-48/+80
| | |
* | | Fix unrelated tests and zlib window sizeBob Weinand2015-05-152-5/+5
| | |
* | | Minor typo in warning messageBob Weinand2015-05-152-2/+14
| | |
* | | Add strategy option to deflate_init()Bob Weinand2015-05-151-4/+23
| | |
* | | Add dictionary option to {in,de}flate_init()Bob Weinand2015-05-153-4/+126
| | |
* | | Add window option to {de,in}flate_init()Bob Weinand2015-05-151-33/+63
| | |
* | | Improve ZBLOCK handling with zlib < 1.2.4Daniel Lowrey2015-05-074-21/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original commit for this issue (62b1293) assumed Z_BLOCK was only defined in < 1.2.4. However, this flush type *is* defined but is only unavailable for use with deflate(). This new commit correctly checks the ZLIB_VERNUM constant to determine if Z_BLOCK flush is available for the current deflate() operation and triggers an appropriate error as needed. New ZLIB_VERSION and ZLIB_VERNUM constants are also exposed in userland to allow testing this behavior in environments running zlib < 1.2.4 (ZLIB_VERNUM check is needed).
* | | Fix Z_BLOCK breakage when built against zlib < 1.2.4Daniel Lowrey2015-05-073-2/+23
| | |
* | | Clean up some type conversionsNikita Popov2015-04-272-29/+20
| | | | | | | | | | | | | | | While at it also fix some type checks in iconv and drop dead and unported code in standard/filters.
* | | Tweak new deflate/inflate implementationsNikita Popov2015-04-252-22/+8
| | | | | | | | | | | | | | | Return NULL on zpp. Don't manually cast zvals to long.
* | | Fix vim folding blockDaniel Lowrey2015-04-241-0/+1
| | |
* | | Merge branch 'deflate'Daniel Lowrey2015-04-249-1/+621
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * deflate: Add inflate_*() test cases Add incremental zlib inflate API Add deflate_*() test cases Several deflate_* changes (more after the jump) Add incremental zlib deflate API
| * | | Add inflate_*() test casesDaniel Lowrey2015-04-234-0/+148
| | | |
| * | | Add incremental zlib inflate APIDaniel Lowrey2015-04-231-3/+150
| | | |
| * | | Add deflate_*() test casesDaniel Lowrey2015-04-234-0/+150
| | | |
| * | | Several deflate_* changes (more after the jump)Daniel Lowrey2015-04-231-64/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove deflate_flush() - Add ZLIB_FINISH constant for use with deflate_add() - Use options array at parameter 2 of deflate_add() to insulate against future API changes - Minor bug fixes - deflate_init() and deflate_add() now always return FALSE in the event of an error
| * | | Add incremental zlib deflate APIBob Weinand2015-04-221-0/+153
| | | |
* | | | Merge branch 'PHP-5.6'Stanislav Malyshev2015-04-144-23/+23
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: (27 commits) fix non-standard C update NEWS 5.4.41 next fix CVE num update NEWS Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode) fix test fix type in fix for #69085 fix memory leak & add test Fix tests fix CVE num Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability) Fix test Additional fix for bug #69324 More fixes for bug #69152 Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions) Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar) Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER) Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4) Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault) ... Conflicts: Zend/zend_exceptions.c ext/curl/interface.c ext/dom/document.c ext/fileinfo/libmagic/softmagic.c ext/gd/gd.c ext/hash/hash.c ext/pgsql/pgsql.c ext/phar/phar.c ext/phar/phar_internal.h ext/standard/http_fopen_wrapper.c ext/standard/link.c ext/standard/streamsfuncs.c ext/xmlwriter/php_xmlwriter.c ext/zlib/zlib.c
| * | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-04-144-23/+23
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: (27 commits) fix non-standard C update NEWS 5.4.41 next fix CVE num update NEWS Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode) fix test fix type in fix for #69085 fix memory leak & add test Fix tests fix CVE num Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability) Fix test Additional fix for bug #69324 More fixes for bug #69152 Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions) Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar) Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER) Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4) Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault) ... Conflicts: ext/standard/http_fopen_wrapper.c
| | * | Merge branch 'PHP-5.4.40' into PHP-5.5.24Stanislav Malyshev2015-04-123-21/+21
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4.40: fix memory leak & add test Fix tests
| | | * | Fix testsStanislav Malyshev2015-04-123-21/+21
| | | | |
| | * | | Merge branch 'PHP-5.4.40' into PHP-5.5.24Stanislav Malyshev2015-04-111-2/+2
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4.40: Additional fix for bug #69324 More fixes for bug #69152 Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions) Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar) Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER) Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4) Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault) Fixed bug #68901 (use after free) Fixed bug #68740 (NULL Pointer Dereference) Fix bug #66550 (SQLite prepared statement use-after-free) Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467 Fix bug #68601 buffer read overflow in gd_gif_in.c Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4" Fixed bug #69293 Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable.
| | | * | Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)Stanislav Malyshev2015-04-111-2/+2
| | | | |
* | | | | cleanup mod version macros and mod defs, round xAnatol Belski2015-03-232-1/+4
| | | | |
* | | | | fix shared compilationAnatol Belski2015-03-231-1/+1
| | | | |
* | | | | Optimize zend_string_realloc() add more specialized versions ↵Dmitry Stogov2015-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | zend_string_extend() and zend_string_truncate()
* | | | | Use zend_string* instead of char* for opened_patch handling. Avoid ↵Dmitry Stogov2015-03-042-2/+2
| |_|_|/ |/| | | | | | | | | | | reallocations and improve string reuse.
* | | | made ZEND_TSRMLS_CACHE_* macros look like function callsAnatol Belski2015-02-161-2/+2
| | | | | | | | | | | | | | | | which also comply with the current semantics for such macros
* | | | Merge branch 'PHP-5.6'Xinchen Hui2015-02-131-4/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: ext/soap/soap.c ext/standard/basic_functions.c ext/zlib/zlib.c
| * | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-02-131-2/+2
| |\ \ \ | | |/ /
| | * | Micro optXinchen Hui2015-02-131-2/+2
| | | |
| | * | Bump yearXinchen Hui2015-01-154-4/+4
| | | |
| * | | bump yearXinchen Hui2015-01-154-4/+4
| | | |
* | | | bump yearXinchen Hui2015-01-154-4/+4
| | | |
* | | | trailing whitespace removalStanislav Malyshev2015-01-103-12/+12
| | | |