summaryrefslogtreecommitdiff
path: root/ext/zlib
Commit message (Collapse)AuthorAgeFilesLines
* fix testsStanislav Malyshev2016-02-011-10/+10
|
* 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
| |
* | Micro optXinchen Hui2015-02-131-2/+2
| |
* | Bump yearXinchen Hui2015-01-154-4/+4
| |
* | the darwin specific test fails for me with the same output which is the ↵Ferenc Kovacs2014-11-272-28/+0
| | | | | | | | | | | | | | | | | | expected for the original test I couldn't find anybody who managed to see this test passing, but I found a bunch of other reports on qa.php.net/reports and on google which do see this test failing on mac. if this change causes you to have this test failing on Mac, please drop me a mail so we can improve the current test so it passes for everybody.
* | Correct two zlib tests to use a string, not a constTim Siebels2014-11-232-2/+2
| |
* | Fixed bug #53829 Compiling PHP with large file support will replace function ↵Matteo Beccati2014-11-121-0/+12
| | | | | | | | gzopen by gzopen64
* | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2014-08-211-2/+1
|\ \ | |/ | | | | | | * PHP-5.4: fix bug #67865
| * fix bug #67865Michael Wallner2014-08-211-2/+1
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Andrey Hristov2014-08-063-1/+28
|\ \ | |/ | | | | | | | | | | Conflicts: NEWS configure.in main/php_version.h
| * Fixed Bug #67724Michael Wallner2014-08-053-1/+28
| | | | | | | | | | | | | | (chained zlib filters silently fail with large amounts of data) Use the same buffer size zlib uses internally to avoid Z_DATA_ERROR on massively compressed data
* | Test output relies on expose_php being onRasmus Lerdorf2014-07-141-0/+2
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-06-084-8/+8
|\ \ | |/ | | | | | | * PHP-5.4: Remove superfluous echos.
| * Remove superfluous echos.Jeff Welch2014-06-084-8/+8
| |
| * Bump yearXinchen Hui2014-01-034-4/+4
| |
* | Bump yearXinchen Hui2014-01-034-4/+4
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Ferenc Kovacs2013-11-0613-15/+15
|\ \ | |/ | | | | | | Conflicts: ext/spl/tests/SplFileObject_rewind_error001.phpt
| * fix many parallel test issuesptarjan2013-11-0613-13/+13
| | | | | | | | | | | | | | | | | | | | | | While running these on HHVM I've run into a lot of parallelism issues. I'm backporting all the fixes I had to do in https://github.com/facebook/hiphop-php/blob/master/hphp/tools/import_zend_test.py#L650 to php core. Most of these changes were just filenames that were shared between tests, but I did more surgery on the fixed ports. I can apreciate port 31337 as much as the next nerd, but random ports are better for tests.
* | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2013-08-092-3/+31
|\ \ | |/ | | | | | | | | * PHP-5.4: fix bug #65391 Update NEWS
| * fix bug #65391Michael Wallner2013-08-092-3/+31
| | | | | | | | | | Unable to send vary header user-agent when ob_start('ob_gzhandler') is called
| * Merge branch 'pull-request/320'Stanislav Malyshev2013-06-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * pull-request/320: this is test 5 not 6 fix race condition more shared names that create race conditions change to a unique filename more shared filenames yet another shared filename don't share a filename to stop race conditions fix race condition for 2-4 and normalize names for others fix race condition when running tests in parallel clean up after test Fix #64572: Clean up after the test Fix #64572: Clean up after the test
* | Fix long-standing visual pain point: the misalignment of './configure help' ↵Christopher Jones2013-08-061-1/+1
| | | | | | | | | | | | text. Whitespace changes and a couple of grammar fixes.
* | Merge branch 'pull-request/320'Stanislav Malyshev2013-06-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * pull-request/320: this is test 5 not 6 fix race condition more shared names that create race conditions change to a unique filename more shared filenames yet another shared filename don't share a filename to stop race conditions fix race condition for 2-4 and normalize names for others fix race condition when running tests in parallel clean up after test Fix #64572: Clean up after the test Fix #64572: Clean up after the test
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-06-1028-28/+28
|\ \ | |/ | | | | | | | | * PHP-5.4: typo fixes (argument) typo fixes (accommodate, parameter)
| * typo fixes (argument)Veres Lajos2013-06-1028-28/+28
| |
| * Happy New YearXinchen Hui2013-01-014-4/+4
| |
* | Removed fork of ext/zlib/tests/bug_52944.phptAnatol Belski2013-04-242-27/+4
| | | | | | | | | | | | The real issue is a bug in asm zlib build, reported here https://github.com/madler/zlib/issues/41 . Non ASM builds behave more predictable.
* | remove set but not used variablesRemi Collet2013-01-021-10/+2
| |
* | Happy New YearXinchen Hui2013-01-014-4/+4
| |
* | Merge branch 'PHP-5.4'Anatoliy Belsky2012-09-094-322/+217
|\ \ | |/ | | | | | | * PHP-5.4: fixed test for bug #52944 also for darwin
| * fixed test for bug #52944 also for darwinReeze Xia2012-09-094-322/+217
| |
* | Merge branch 'PHP-5.4'Anatoliy Belsky2012-09-034-3/+163
|\ \ | |/ | | | | | | * PHP-5.4: forked two tests for windows
| * forked two tests for windowsAnatoliy Belsky2012-09-034-3/+163
| | | | | | | | | | | | | | | | | | | | * bug55544.phpt - VT vs. EXT at the start of the data block, but the data can still be decoded correctly * bug_52944.phpt works with the corrupted data and has some different out Most likely the ASM optimization under windows is responsible for this behaviour.
* | Merge branch 'PHP-5.4'Xinchen Hui2012-07-243-4/+10
|\ \ | |/
| * binary compatibilityXinchen Hui2012-07-241-1/+1
| |
| * Re-fix bug #55544Xinchen Hui2012-07-243-3/+9
| |
* | correct the author name introduced in bb685512Xinchen Hui2012-07-241-1/+1
| |
* | Merge branch 'PHP-5.4'Xinchen Hui2012-07-241-0/+7
|\ \ | |/
| * foldersXinchen Hui2012-07-241-0/+7
| |
* | Merge branch 'PHP-5.4'Xinchen Hui2012-07-212-1/+4
|\ \ | |/
| * Fixed bug #55544 (ob_gzhandler always conflicts with zlib.output_compression)Xinchen Hui2012-07-212-1/+4
| |
* | Merge branch 'PHP-5.4'Anatoliy Belsky2012-07-131-0/+5
|\ \ | |/ | | | | | | * PHP-5.4: Fixed bug #61677 ext\zlib\tests\bug_52944.phpt fails
| * Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-07-131-0/+5
| |\ | | | | | | | | | | | | * PHP-5.3: Fixed bug #61677 ext\zlib\tests\bug_52944.phpt fails
| | * Fixed bug #61677 ext\zlib\tests\bug_52944.phpt failsAnatoliy Belsky2012-07-131-0/+5
| | | | | | | | | | | | | | | The test is known to fail on windows with zlib version < 1.2.7 (current dep is 1.2.5), with 1.2.7 it works. As it's primarily a zlib 1.2.5 issue on windows, skip it for now.
* | | Merge branch 'PHP-5.4'Anatoliy Belsky2012-06-193-2/+66
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: split gzgetc_basic.phpt for zlib 1.2.7
| * | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-06-193-2/+66
| |\ \ | | |/ | | | | | | | | | * PHP-5.3: split gzgetc_basic.phpt for zlib 1.2.7
| | * split gzgetc_basic.phpt for zlib 1.2.7Anatoliy Belsky2012-06-193-2/+66
| | |