summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* set versions and update NEWSphp-7.0.15PHP-7.0.15Anatol Belski2017-01-173-7/+32
|
* Fix #73868: DOS vulnerability in gdImageCreateFromGd2Ctx()Christoph M. Becker2017-01-173-2/+24
| | | | | | | | We must not pretend that there are image data if there are none. Instead we fail reading the image file gracefully. (cherry picked from commit cdb648dc4115ce0722f3cc75e6a65115fc0e56ab) (cherry picked from commit f1b2afc9d9e77edf41804f5dfc4e2069d8a12975)
* Fix #73869: Signed Integer Overflow gd_io.cChristoph M. Becker2017-01-174-0/+23
| | | | | | | | | | | | GD2 stores the number of horizontal and vertical chunks as words (i.e. 2 byte unsigned). These values are multiplied and assigned to an int when reading the image, what can cause integer overflows. We have to avoid that, and also make sure that either chunk count is actually greater than zero. If illegal chunk counts are detected, we bail out from reading the image. (cherry picked from commit 5b5d9db3988b829e0b121b74bb3947f01c2796a1) (cherry picked from commit d2274b01cbbadf5516b3ea87ad76fbae18834007)
* Revert "Merge branch 'bugfix_timeout_61471' of ↵php-7.0.15RC1Anatol Belski2017-01-051-44/+1
| | | | | | | | | https://github.com/axot/php-src into PHP-7.0" This reverts commit a8931df672bb173ef81c10e4fc2a5de23789c935, reversing changes made to f2f35a2b27d0074ab015b8a37d6563eec74147d5. (cherry picked from commit 57736cc937fc6dfdfb403293d7bf88b264e83e15)
* Merge branch 'PHP-5.6' into PHP-7.0Nikita Popov2017-01-051-1/+1
| | | | (cherry picked from commit 2022dacb9997df2391866df99eb1592a1527fc27)
* quick fix for the base branch version parsing, not perfect stillAnatol Belski2017-01-051-1/+1
| | | | (cherry picked from commit 2ca5aa9418a126dc4e5fd6becca41adcf86f000f)
* prepare RC versionsAnatol Belski2017-01-053-4/+4
|
* Merge branch 'PHP-5.6' into PHP-7.0Nikita Popov2017-01-053-517/+590
|\
| * Add tests for delayed __wakeup()Nikita Popov2017-01-057-0/+263
| |
| * Implement delayed __wakeupNikita Popov2017-01-052-535/+622
| |
* | Merge branch 'pull-request/2273' into PHP-7.0Joe Watkins2017-01-04896-908/+908
|\ \ | | | | | | | | | | | | * pull-request/2273: Update copyright headers to 2017
| * | Update copyright header to 2017 in calendar.cSammy Kaye Powers2017-01-041-1/+1
| | |
| * | Update copyright headers to 2017Sammy Kaye Powers2017-01-04895-907/+907
|/ /
* | switch to the beta1 SDK for AppVeyor buildAnatol Belski2017-01-041-1/+1
| |
* | remove duplicate testJoe Watkins2017-01-041-4/+0
| |
* | fix testJoe Watkins2017-01-041-3/+4
| |
* | Merge branch 'pull-request/1312' into PHP-7.0Joe Watkins2017-01-043-3/+38
|\ \ | | | | | | | | | | | | | | | * pull-request/1312: get_defined_functions extra parameter to exclude disabled functions news entry for PR #1312
| * | Added "exclude_disabled" argument to "get_defined_functions".Willian Gustavo Veiga2015-06-022-4/+17
| | |
| * | Fix bug #31875 - get_defined_functions() should not list disabled functions.Willian Gustavo Veiga2015-05-302-1/+21
| | |
* | | Fix PDO tests to match SQL standard syntax and pass Firebird tests.Dorin Marcoci2017-01-032-3/+3
| | |
* | | better skip on filesAnatol Belski2017-01-031-2/+4
| | | | | | | | | | | | some more could be added
* | | Fix buildNikita Popov2017-01-031-2/+2
| | |
* | | Fix Bug #73462 - Persistent connections don't set $connect_errnoVince2017-01-033-0/+49
| | | | | | | | | | | | | | | Persistent connections skipped resetting $connect_error and $connect_errno values This adds the "clear error" line to persistent connections for consistency
* | | Merge branch 'pull-request/1905'Joe Watkins2017-01-033-11/+519
| | | | | | | | | | | | | | | * pull-request/1905: pack()/unpack() for Big Endian float/double and Little Endian float/double
* | | Fix opcache test dependenciesRasmus Lerdorf2017-01-024-10/+12
| | |
* | | Use correct string release functionStanislav Malyshev2017-01-022-2/+2
| | |
* | | Fix error reportingStanislav Malyshev2017-01-022-4/+4
| | |
* | | Merge branch 'PHP-7.0.15' into PHP-7.0Stanislav Malyshev2017-01-023-17/+44
|\ \ \ | | | | | | | | | | | | | | | | | | | | * PHP-7.0.15: Fix #73832 - leave the table in a safe state if the size is too big. Fix bug #73831 - NULL Pointer Dereference while unserialize php object
| * | | Fix #73832 - leave the table in a safe state if the size is too big.Stanislav Malyshev2017-01-021-1/+1
| | | |
| * | | Fix bug #73831 - NULL Pointer Dereference while unserialize php objectStanislav Malyshev2016-12-312-16/+43
| | | |
* | | | Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2017-01-0211-515/+575
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Fix bug #73737 FPE when parsing a tag format Fix bug #73773 - Seg fault when loading hostile phar Fix bug #73825 - Heap out of bounds read on unserialize in finish_nested_data() Fix bug #73768 - Memory corruption when loading hostile phar Fix int overflows in phar (bug #73764)
| * | | Merge branch 'PHP-5.6.30' into PHP-5.6Stanislav Malyshev2017-01-0211-511/+571
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6.30: Fix bug #73737 FPE when parsing a tag format Fix bug #73773 - Seg fault when loading hostile phar Fix bug #73825 - Heap out of bounds read on unserialize in finish_nested_data() Fix bug #73768 - Memory corruption when loading hostile phar Fix int overflows in phar (bug #73764)
| | * | | Fix bug #73737 FPE when parsing a tag formatStanislav Malyshev2016-12-313-1/+13
| | | | |
| | * | | Fix bug #73773 - Seg fault when loading hostile pharStanislav Malyshev2016-12-311-2/+2
| | | | |
| | * | | Fix bug #73825 - Heap out of bounds read on unserialize in finish_nested_data()Stanislav Malyshev2016-12-303-36/+76
| | | | |
| | * | | Fix bug #73768 - Memory corruption when loading hostile pharStanislav Malyshev2016-12-303-2/+17
| | | | |
| | * | | Fix int overflows in phar (bug #73764)Stanislav Malyshev2016-12-303-2/+18
| | | | |
* | | | | set exclude AppVeyor branches and ignore builds on NEWS updatesAnatol Belski2017-01-031-0/+9
| | | | |
* | | | | Fix early freeNikita Popov2017-01-031-1/+1
| | | | |
* | | | | Disable pdb generation for AppVeyorAnatol Belski2017-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | It is not needed for the test runs and would speedup the compilation phase.
* | | | | Add NEWS entriesNikita Popov2017-01-021-0/+3
| | | | |
* | | | | Optimize get_browser() using prefix and contains checksNikita Popov2017-01-021-63/+185
| | | | | | | | | | | | | | | | | | | | | | | | | Avoid expensive regex compilations by checking for prefix and contained segments beforehand.
* | | | | Optimize browscap loading and representationNikita Popov2017-01-021-132/+249
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid many string duplications, use interning (browscap-local, of course), reduce pattern size, use more compact key-value representation, build result array only on demand.
* | | | | Add get_browser() test against larger corpusNikita Popov2017-01-023-0/+14368
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Testing corpus provided by Anatol against current browscap.ini lite. About 30% of all agents are not recognized by this browscap.ini, but this should give us decent coverage.
* | | | | Fix for nowait.phpt failing intermittentlyMitch Hagstrand2017-01-021-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The parent process was releasing the child semaphore after the child process continued execution. Now the child semaphore is released before the child process continues execution.
* | | | | Fix for sporadic segfault with MYSQLI_OPT_INT_AND_FLOAT_NATIVEvanviegen2017-01-022-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #73800 news entry for PR #2250
* | | | | news entry for PR #2267Joe Watkins2017-01-021-0/+3
| | | | |
* | | | | Fixed #67474 (getElementsByTagNameNS and default namespace)Arnout Boks2017-01-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug was caused by the fact that dom_get_elements_by_tag_name_ns_raw uses an empty string to filter on the default namespace (as NULL means 'no filter'), whereas in the node itself the default namespace is signalled by nodep->ns being null.
* | | | | Add (failing) testcase for bug #67474Arnout Boks2017-01-021-0/+18
| | | | |
* | | | | Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0Joe Watkins2017-01-02168-4532/+6015
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'PHP-7.0' of git.php.net:/php-src: (146 commits) Flush stderr on win32 in cli_log_message Fixed bug #73154 FIx bug #70213 Fix dom class can't be inherited by the internal class Another try at making concat_003 more reliable Fix flaky openssl_pkey_new test Make Opcache tests using the cli server more reliable Revert "Fix #73530: Unsetting result set may reset other result set" define php_ap_map_http_request_error function for older httpd only add old versions of httpd support Disable AppVeyor fast_finish Makes the sapi web server and curl tests more reliable Fixes the curl tests to be more reliable in Travis CI Interpretation of curl_setopt values for boolean parameters Fixes #65689. PDO_Firebrid / exec() does not free allocated statement. Fix alpn_ctx leaking in openssl Fixed bug #73373 (deflate_add does not verify that output was not truncated) Fix IS_UNDEF comparisons in opcache Fixed bug #73704 (phpdbg shows the wrong line in files with shebang) Increase timing quota for small string concat test ...