summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * Fixed #73969 - Fixed segmentation fault when debug_print_backtrace calledandrewnester2017-01-224-6/+44
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2017-01-222-0/+51
|\ \ | |/ | | | | | | * PHP-7.0: Add regression test for bug #47946
| * Add regression test for bug #47946Christoph M. Becker2017-01-222-0/+51
| | | | | | | | | | | | | | | | | | This bug had already been fixed, but apparently there's no regression test yet, so we add one. Note that the expected image has black pixel artifacts, which are another issue (perhaps bug #40158), and would have to be adressed separately.
* | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-221-2/+2
|\ \ | |/ | | | | | | * PHP-7.0: Fix intermittent segfault in GD library
| * Fix intermittent segfault in GD libraryMitch Hagstrand2017-01-221-2/+2
| | | | | | | | | | The gdIOCtx struct should be zero filled with ecalloc. emalloc does not zero fill the struct.
* | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2017-01-211-1/+1
|\ \ | |/ | | | | | | * PHP-7.0: Add myself as primary maintainer of GD
| * Add myself as primary maintainer of GDChristoph M. Becker2017-01-211-1/+1
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2017-01-216-7/+24
|\ \ | |/ | | | | | | * PHP-7.0: Fix #73968: Premature failing of XBM reading
| * Fix #73968: Premature failing of XBM readingChristoph M. Becker2017-01-215-4/+24
| | | | | | | | | | | | | | | | | | We must take into account the line padding, when we're reading XBM files. We deliberately ignore the potential integer overflow here, because that would be caught by gdImageCreate() or even earlier if `bytes==0`, what happens in libgd00094.phpt which we adapt accordingly.
* | Fix bug #73961 environmental build dependency in hash sha3 sourceJoe Watkins2017-01-213-1/+3
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-01-210-0/+0
|\ \ | |/ | | | | | | * PHP-7.0: backport 51e1da6ea1e663908302e162ced1b7a8cb5aee05 into 7.0
| * backport 51e1da6ea1e663908302e162ced1b7a8cb5aee05 into 7.0Anatol Belski2017-01-211-1/+8
| |
* | exclude debug codeAnatol Belski2017-01-211-2/+13
| |
* | ensure the string for conversion is \0 terminated and integradeAnatol Belski2017-01-211-4/+19
| | | | | | | | additional path length check
* | Fixed bug #73962 bug with symlink related to cyrillic directoryAnatol Belski2017-01-203-3/+83
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-203-1/+31
|\ \ | |/ | | | | | | * PHP-7.0: Fixed #73959 - lastInsertId fails to throw an exception in pdsql
| * Fixed #73959 - lastInsertId fails to throw an exception in pdsqlandrewnester2017-01-203-1/+31
| |
* | NEWSRemi Collet2017-01-201-0/+3
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Remi Collet2017-01-203-1/+5
|\ \ | |/ | | | | | | | | * PHP-7.0: NEWS Fixed bug #73965 DTrace reported as enabled when disabled
| * NEWSRemi Collet2017-01-201-0/+3
| |
| * Fixed bug #73965 DTrace reported as enabled when disabledRemi Collet2017-01-203-1/+5
| |
* | Update comment, incorrect since 224aaf94SjonHortensius2017-01-191-2/+1
| | | | | | | | In 224aaf94; the warning was enabled; making the comment above incorrect. I've updated the comment to reflect the current code
* | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2017-01-192-1/+13
|\ \ | |/ | | | | | | * PHP-7.0: Fixed another part in ldap (bug #73933)
| * Fixed another part in ldap (bug #73933)Xinchen Hui2017-01-192-1/+13
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Ferenc Kovacs2017-01-190-0/+0
|\ \ | |/
| * Merge branch 'PHP-5.6' into PHP-7.0Ferenc Kovacs2017-01-190-0/+0
| |\
| | * update NEWSFerenc Kovacs2017-01-191-0/+2
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-01-181-73/+0
|\ \ \ | |/ /
| * | Removing zmemcheck from .gdbinitMitch Hagstrand2017-01-181-73/+0
| | | | | | | | | | | | It doesn't seem to make sense anymore
* | | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-183-3/+28
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Fix bug #73949 leak in mysqli_fetch_object
| * | Fix bug #73949 leak in mysqli_fetch_objectJoe Watkins2017-01-183-3/+28
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-182-2/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Remove remnants of TSMRLS_* macro calls
| * | Remove remnants of TSMRLS_* macro callsThomas Punt2017-01-182-2/+2
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-182-2/+59
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: DNS CAA record type implementation and tests for https://bugs.php.net/bug.php?id=73850
| * | DNS CAA record type implementation and tests for ↵Marcus Bointon2017-01-182-2/+59
| | | | | | | | | | | | https://bugs.php.net/bug.php?id=73850
* | | Add php_openssl_store_errors to bailoutsLeigh2017-01-181-0/+2
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Leigh2017-01-181-1/+1
|\ \ \ | |/ /
| * | Change free to OPENSSL_freeLeigh2017-01-181-1/+1
| | |
* | | NEWSRemi Collet2017-01-181-0/+3
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Remi Collet2017-01-181-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-7.0: NEWS Fix #73956 Link use CC instead of CXX
| * | NEWSRemi Collet2017-01-181-0/+3
| | |
| * | Fix #73956 Link use CC instead of CXXRemi Collet2017-01-181-1/+1
| | |
* | | Remove more TSRMLS_CC macrosThomas Punt2017-01-181-2/+2
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-181-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Fix ce comparison
| * | Fix ce comparisonThomas Punt2017-01-181-1/+1
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-171-2/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: updates to release docs
| * | updates to release docsJoe Watkins2017-01-171-2/+2
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-171-12/+33
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Fixes in .gdbinit for ZE 3
| * | Fixes in .gdbinit for ZE 3Mitch Hagstrand2017-01-171-12/+33
| | | | | | | | | | | | | | | | | | 1. Fixed print_pi function 2. Fixed printing properties in ____printzv_contents 3. Added optional max length parameter in ____print_str
* | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-01-170-0/+0
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: [ci skip] sync NEWS