| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix #73869: Signed Integer Overflow gd_io.cphp-7.1.1PHP-7.1.1 | Christoph M. Becker | 2017-01-17 | 4 | -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) | ||||
| * | Fix #73868: DOS vulnerability in gdImageCreateFromGd2Ctx() | Christoph M. Becker | 2017-01-17 | 3 | -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) | ||||
| * | missing news entries | Joe Watkins | 2017-01-17 | 1 | -0/+17 |
| | | |||||
| * | set version for stable 7.1.1 | Joe Watkins | 2017-01-17 | 3 | -4/+4 |
| | | |||||
| * | bump versions for 7.1.1RC1php-7.1.1RC1 | Joe Watkins | 2017-01-05 | 3 | -4/+4 |
| | | |||||
| * | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2017-01-05 | 1 | -44/+1 |
| |\ | | | | | | | | | * PHP-7.0: Revert "Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into PHP-7.0" | ||||
| | * | Revert "Merge branch 'bugfix_timeout_61471' of ↵ | Anatol Belski | 2017-01-05 | 1 | -44/+1 |
| | | | | | | | | | | | | | | | https://github.com/axot/php-src into PHP-7.0" This reverts commit a8931df672bb173ef81c10e4fc2a5de23789c935, reversing changes made to f2f35a2b27d0074ab015b8a37d6563eec74147d5. | ||||
| * | | Merge branch 'PHP-7.0' into PHP-7.1 | Nikita Popov | 2017-01-05 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | Merge branch 'PHP-5.6' into PHP-7.0 | Nikita Popov | 2017-01-05 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Fix printf modifier | Nikita Popov | 2017-01-05 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'PHP-7.0' into PHP-7.1 | Joe Watkins | 2017-01-05 | 1 | -3/+3 |
| |\ \ \ | |/ / | | | | | | | | | | * PHP-7.0: Fix php-fpm.service.in | ||||
| | * | | Merge branch 'pull-request/1256' into PHP-7.0 | Joe Watkins | 2017-01-05 | 1 | -3/+3 |
| | |\ \ | | | | | | | | | | | | | | | | | * pull-request/1256: Fix php-fpm.service.in | ||||
| | | * | | Fix php-fpm.service.in | Floris Bos | 2015-05-01 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Expand file paths. - Remove obsolete After=syslog.target. Syslog is socket activated nowadays. Signed-off-by: Floris Bos <bos@je-eigen-domein.nl> | ||||
| * | | | | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2017-01-05 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | * PHP-7.0: quick fix for the base branch version parsing, not perfect still | ||||
| | * | | | quick fix for the base branch version parsing, not perfect still | Anatol Belski | 2017-01-05 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2017-01-05 | 0 | -0/+0 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | * PHP-7.0: move dev to next | ||||
| | * | | | move dev to next | Anatol Belski | 2017-01-05 | 3 | -5/+9 |
| | | | | | |||||
| * | | | | Add Z_EXTRA macro | Nikita Popov | 2017-01-05 | 3 | -6/+10 |
| | | | | | | | | | | | | | | | | | For use with u2 values which don't deserve a custom macro... | ||||
| * | | | | Merge branch 'PHP-7.0' into PHP-7.1 | Nikita Popov | 2017-01-05 | 3 | -517/+590 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge branch 'PHP-5.6' into PHP-7.0 | Nikita Popov | 2017-01-05 | 3 | -517/+590 |
| | |\ \ \ | | | |/ | | |/| | |||||
| | | * | | Add tests for delayed __wakeup() | Nikita Popov | 2017-01-05 | 7 | -0/+263 |
| | | | | | |||||
| | | * | | Implement delayed __wakeup | Nikita Popov | 2017-01-05 | 2 | -535/+622 |
| | | | | | |||||
| | * | | | Merge branch 'pull-request/2273' into PHP-7.0 | Joe Watkins | 2017-01-04 | 896 | -908/+908 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | * pull-request/2273: Update copyright headers to 2017 | ||||
| | | * | | | Update copyright header to 2017 in calendar.c | Sammy Kaye Powers | 2017-01-04 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Update copyright headers to 2017 | Sammy Kaye Powers | 2017-01-04 | 895 | -907/+907 |
| | |/ / / | |||||
| * | | | | Merge branch 'pull-request/2274' into PHP-7.1 | Joe Watkins | 2017-01-04 | 934 | -946/+946 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | * pull-request/2274: Update copyright headers to 2017 | ||||
| | * | | | | Update copyright header to 2017 in calendar.c | Sammy Kaye Powers | 2017-01-04 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Update copyright headers to 2017 | Sammy Kaye Powers | 2017-01-04 | 933 | -945/+945 |
| |/ / / / | |||||
| * | | | | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2017-01-04 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | * PHP-7.0: switch to the beta1 SDK for AppVeyor build | ||||
| | * | | | switch to the beta1 SDK for AppVeyor build | Anatol Belski | 2017-01-04 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'PHP-7.0' into PHP-7.1 | Joe Watkins | 2017-01-04 | 1 | -4/+0 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | * PHP-7.0: remove duplicate test | ||||
| | * | | | remove duplicate test | Joe Watkins | 2017-01-04 | 1 | -4/+0 |
| | | | | | |||||
| * | | | | Merge branch 'PHP-7.0' into PHP-7.1 | Joe Watkins | 2017-01-04 | 1 | -3/+4 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | * PHP-7.0: fix test | ||||
| | * | | | fix test | Joe Watkins | 2017-01-04 | 1 | -3/+4 |
| | | | | | |||||
| * | | | | Merge branch 'PHP-7.0' into PHP-7.1 | Joe Watkins | 2017-01-04 | 3 | -3/+38 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | * PHP-7.0: get_defined_functions additional parameter to exclude disabled functions news entry for PR #1312 | ||||
| | * | | | Merge branch 'pull-request/1312' into PHP-7.0 | Joe Watkins | 2017-01-04 | 3 | -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 Veiga | 2015-06-02 | 2 | -4/+17 |
| | | | | | | |||||
| | | * | | | Fix bug #31875 - get_defined_functions() should not list disabled functions. | Willian Gustavo Veiga | 2015-05-30 | 2 | -1/+21 |
| | | | | | | |||||
| * | | | | | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2017-01-03 | 2 | -3/+3 |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | * PHP-7.0: Fix PDO tests to match SQL standard syntax and pass Firebird tests. | ||||
| | * | | | | Fix PDO tests to match SQL standard syntax and pass Firebird tests. | Dorin Marcoci | 2017-01-03 | 2 | -3/+3 |
| | | | | | | |||||
| * | | | | | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2017-01-03 | 1 | -2/+4 |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | * PHP-7.0: better skip on files | ||||
| | * | | | | better skip on files | Anatol Belski | 2017-01-03 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | some more could be added | ||||
| * | | | | | Merge branch 'PHP-7.0' into PHP-7.1 | Nikita Popov | 2017-01-03 | 4 | -2/+51 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Fix build | Nikita Popov | 2017-01-03 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Fix Bug #73462 - Persistent connections don't set $connect_errno | Vince | 2017-01-03 | 3 | -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 Watkins | 2017-01-03 | 3 | -11/+519 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | * pull-request/1905: pack()/unpack() for Big Endian float/double and Little Endian float/double | ||||
| | * | | | | Fix opcache test dependencies | Rasmus Lerdorf | 2017-01-02 | 4 | -10/+12 |
| | | | | | | |||||
| * | | | | | Merge branch 'pull-request/1905' | Joe Watkins | 2017-01-03 | 3 | -11/+519 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | * pull-request/1905: pack()/unpack() for Big Endian float/double and Little Endian float/double | ||||
| * | | | | | Fix opcache test dependencies | Rasmus Lerdorf | 2017-01-02 | 4 | -10/+12 |
| | | | | | | |||||
| * | | | | | Merge branch 'PHP-7.0' into PHP-7.1 | Stanislav Malyshev | 2017-01-02 | 2 | -2/+2 |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | * PHP-7.0: Use correct string release function | ||||
 |
index : delta/php-git.git | |
| git.php.net: repository/php-src.git |
| summaryrefslogtreecommitdiff |