summaryrefslogtreecommitdiff
path: root/ext/zlib
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-173-3/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: fix unserializer patch move this entry to the correct version add missing NEWS entry add missing NEWS entry Updated or skipped certain 32-bit tests add NEWS entry for #68594 5.4.37 add more BC breaks update news add CVE add missing test file Fix bug #68594 - Use after free vulnerability in unserialize() Fix typo Hash value must not zero?
| * Updated or skipped certain 32-bit testsAndrea Faulds2014-12-173-3/+6
| |
* | second shot on removing TSRMLS_*Anatol Belski2014-12-141-2/+2
| |
* | first shot remove TSRMLS_* thingsAnatol Belski2014-12-134-105/+105
| |
* | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-11-272-28/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: updated NEWS refactored the mbstring config.w32 Update NEWS Fixed compilation warnings Fixed bug #68504 --with-libmbfl configure option not present on Windows Changed "finally" handling. Removed EX(fast_ret) and EX(delayed_exception). Allocate and use additional IS_TMP_VAR slot on VM stack instead. the darwin specific test fails for me with the same output which is the 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. #68446 is fixed Reimplemented silence operator (@) handling on exceptions. Now each silence region is stored in op_array->brk_cont_array. On exception ZEND_HANDLE_EXCEPTION handler traverse this array and restore original EG(error_reporting) if exception occured inside a "silence" region. remove the NEWS entries for the reverted stuff typo fix go back with phpdbg to the state of 5.6.3, reverting the controversial commits(remote debugging/xml protocol) 5.5.21 now New label length test Fix ext/filter/tests/033.phpt Fix filter_list test FILTER_VALIDATE_DOMAIN and RFC conformance for FILTER_VALIDATE_URL Conflicts: ext/mbstring/config.w32
| * Merge branch 'PHP-5.6'Ferenc Kovacs2014-11-272-28/+0
| |\ | | | | | | | | | | | | | | | * PHP-5.6: the darwin specific test fails for me with the same output which is the 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. 5.5.21 now
| | * Merge branch 'PHP-5.5' into PHP-5.6Ferenc Kovacs2014-11-272-28/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: the darwin specific test fails for me with the same output which is the 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. 5.5.21 now Conflicts: configure.in main/php_version.h
| | | * 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.
| | * | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-11-232-2/+2
| | |\ \ | | | |/ | | | | | | | | | | | | * PHP-5.5: Correct two zlib tests to use a string, not a const
| | | * Correct two zlib tests to use a string, not a constTim Siebels2014-11-232-2/+2
| | | |
| | * | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-232-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ext/ftp/ftp.h ext/pcre/pcrelib/pcre_printint.c ext/pcre/pcrelib/sljit/sljitLir.c ext/pcre/pcrelib/sljit/sljitLir.h ext/pcre/pcrelib/sljit/sljitNativeARM_32.c ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c ext/pgsql/pgsql.c ext/phar/func_interceptors.c ext/soap/soap.c ext/standard/image.c
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-11-264-4/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (102 commits) fix dir separator in test fix TS build fix TS build Better fix for bug #68446 Revert "Merge remote-tracking branch 'origin/PHP-5.6'" Revert NEWS and set test to XFAIL Revert "Fix bug #68446 (bug with constant defaults and type hints)" Improved zend_hash_clean() and added new optimized zend_symtable_clean() Use inline version of zval_ptr_dtor() Added new optimized zend_array_destroy() function Moved i_zval_ptr_dtor() from zend_execute.h to zend_variables.h fix REGISTER_NS_*_CONSTANT macros Removed useless assert. EG(uninitialized_zval) can't be refcounted. Use specialized destructors when types of zvals are known. move tests into proper place Improved assignment to object property Reuse zend_assign_to_variable() in zend_std_write_property() cleanup comments from svn/cvs era fix dir separator in test fork test for windows ...
| * | | Merge branch 'pull-request/817'Stanislav Malyshev2014-11-232-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * pull-request/817: Correct two zlib tests to use a string, not a const
| | * | | Correct two zlib tests to use a string, not a constTim Siebels2014-09-122-2/+2
| | | | |
| * | | | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-232-2/+2
| | | | |
* | | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-11-181-0/+12
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (398 commits) NEWS add test for bug #68381 Fixed bug #68381 Set FPM log level earlier during init proper dllexport move to size_t where zend_string is used internally fix some datatype mismatches return after the warning, to fix uninitialized salt usage fix datatype mismatches add missing type specifier fix datatype mismatches fix unsigned check "extern" shouldn't be used for definitions joined identical conditional blocks simplify fpm tests SEND_VAR_NO_REF optimization Add test for bug #68442 Add various tests for FPM - covering recent bugs (68420, 68421, 68423, 68428) - for UDS - for ping and status URI - for multi pool and multi mode Include small MIT FastCGI client library from https://github.com/adoy/PHP-FastCGI-Client Get rid of zend_free_op structure (use zval* instead). Get rid of useless TSRMLS arguments. Add new FPM test for IPv4/IPv6 ... Conflicts: win32/build/config.w32
| * | | | Merge branch 'PHP-5.6'Matteo Beccati2014-11-121-0/+12
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Fixed bug #53829 Compiling PHP with large file support will replace function gzopen by gzopen64 Remove unneeded md5 hashing from PHP-5.6 branch. It's removed from master already by my previous commit. Conflicts: ext/session/session.c
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Matteo Beccati2014-11-121-0/+12
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | * PHP-5.5: Fixed bug #53829 Compiling PHP with large file support will replace function gzopen by gzopen64
| | | * | Fixed bug #53829 Compiling PHP with large file support will replace function ↵Matteo Beccati2014-11-121-0/+12
| | | | | | | | | | | | | | | | | | | | gzopen by gzopen64
* | | | | converted some ext/mysql* and fixed ext/zlibAnatol Belski2014-10-151-2/+2
| | | | |
* | | | | converted ext/zlib with static tsrm ls cacheAnatol Belski2014-10-154-4/+9
| | | | |
* | | | | bring back all the TSRMLS_FETCH() stuffAnatol Belski2014-10-151-0/+3
| | | | | | | | | | | | | | | | | | | | for better comparability with the mainstream
* | | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-10-061-2/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: bring back the correct php_version.h fix the empty_strings SAPI shutdown leak in TS build Use fastcall calling convention for heap functions fix leaking the empty_string in TS builds remove successive assignment
| * | | | remove successive assignmentAnatol Belski2014-10-061-2/+0
| | | | |
* | | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-10-011-121/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (26 commits) Micro optimization Drop unused INIT_STRING opcode Drop unused RAISE_ABSTRACT_ERROR opcode CT substitute unqualified true/false/null in namespaces Fix a couple compile warnings fix test filename one more test to illustrate transfer of an arbitrary data amount throug pipes fix tests on linux better test cleanup Use more readable inline functions increase the polling period to not to break existing behaviours updated NEWS Fixed bug #51800 proc_open on Windows hangs forever Fixed segfault Set an LDAP error code when failing ldap_bind due to null bytes Fix segmentation fault in debug_backtrace() Drop support for GMP 4.1 Make gmp_setbit and gmp_clrbit return values consistent removed *.dsw and *.dsp files Opcache compatibility for coalesce operator ...
| * | | | removed *.dsw and *.dsp filesAnatol Belski2014-09-281-121/+0
| | | | |
* | | | | cleanup after the removed PHP_OUTPUT_TSRMLSAnatol Belski2014-09-261-3/+0
|/ / / /
* | | | Merge branch 'master' into issue-67910Florian MARGAINE2014-09-204-23/+32
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.PARAMETER_PARSING_API ext/gmp/tests/001.phpt
| * | | | s/PHP 5/PHP 7/Johannes Schlüter2014-09-194-4/+4
| | | | |
| * | | | fix signed/unsigned warning and add a noteAnatol Belski2014-09-191-2/+4
| | | | |
| * | | | reduce struct size by 8 byte on 64 bitAnatol Belski2014-09-171-1/+1
| | | | |
| * | | | reduce the struct size (under circumstances) on 64 bitAnatol Belski2014-09-131-1/+1
| | |_|/ | |/| |
| * | | Use PHP_GINIT to suppress incompatible pointer typeXinchen Hui2014-09-041-2/+2
| | | |
| * | | Refactored INI subsystem to use zend_string* instead of char*Dmitry Stogov2014-09-011-13/+20
| | | |
* | | | Replaces php5 with php7, without whitespace changes.Florian MARGAINE2014-09-202-5/+5
|/ / /
* | | data type fixesAnatol Belski2014-08-291-1/+1
| | |
* | | first show to make 's' work with size_tAnatol Belski2014-08-271-5/+5
| | |
* | | master renames phase 7PRE_AST_MERGEAnatol Belski2014-08-251-4/+4
| | |
* | | master renames phase 1Anatol Belski2014-08-253-41/+41
| | |
* | | fixes to %pd format usageAnatol Belski2014-08-241-4/+4
| | |
* | | Merge remote-tracking branch 'weltling/master'POST_64BIT_BRANCH_MERGEAnatol Belski2014-08-224-43/+43
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * weltling/master: (725 commits) fix zpp fixed array_pad() fix zpp fix zpp fix zpp fix zpp and a bit more fix zpp fix zpp fix zpp fix zpp fix zpp fix zpp fix zpp fix zpp fix zpp fix zpp fix zpp fix zpp fix zpp fixed the test ...
| * | | ported ext/zlibAnatol Belski2014-08-193-20/+20
| | | |
| * | | basic macro replacements, all at onceAnatol Belski2014-08-192-23/+23
| | | |
* | | | Merge branch 'PHP-5.6'Michael Wallner2014-08-211-2/+1
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | | | | * PHP-5.6: fix bug #67865 updated NEWS to fit last release NEWS Fix bug #67878 program_prefix not honoured in man pages NEWS Fix bug #67878 program_prefix not honoured in man pages
| * | Merge branch 'PHP-5.5' into PHP-5.6Michael Wallner2014-08-211-2/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | * PHP-5.5: fix bug #67865 updated NEWS to fit last release NEWS Fix bug #67878 program_prefix not honoured in man pages
| | * 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.5' into PHP-5.6Andrey Hristov2014-08-063-1/+28
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Conflicts: ext/fileinfo/data_file.c ext/fileinfo/libmagic/softmagic.c ext/fileinfo/magicdata.patch
| | * | Merge branch 'PHP-5.4' into PHP-5.5Andrey Hristov2014-08-063-1/+28
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: NEWS configure.in main/php_version.h
* | | | Merge branch 'master' into testDmitry Stogov2014-08-113-1/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (39 commits) Add __debugInfo() to UPGRADING. fix TS build Update NEWS Update NEWS Update NEWS Small tidy ups and raise visibility of GitHub PR process Bug #41631: Observe socket read timeouts in SSL streams wrap int8_t and int16_t with #ifdef to avoid possible clashes - Updated to version 2014.6 (2014f) Removed Countable::count() change info from UPGRADE.INTERNALS too NEWS and UPGRADING for intdiv() Revert "Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option" Fixed skip case for intdiv 64-bit test Use callback structure Add EXPECTF Fix handling of multi-result sets with PS...used to clean not only the result set but the whole PS. 5.5.17 now 5.4.33-dev now Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option ... Conflicts: ext/fileinfo/libmagic/softmagic.c main/streams/xp_socket.c