Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2015-07-07 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Better fix for bug #69958 update news Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM) Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath Fix bug #69958 - Segfault in Phar::convertToData on invalid file Conflicts: ext/mysqlnd/mysqlnd.c | ||||
| * | Better fix for bug #69958 | Stanislav Malyshev | 2015-07-07 | 2 | -9/+15 |
| | | |||||
| * | Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM) | Stanislav Malyshev | 2015-07-07 | 1 | -25/+40 |
| | | |||||
| * | Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath | Stanislav Malyshev | 2015-07-07 | 1 | -2/+8 |
| | | |||||
| * | Fix bug #69958 - Segfault in Phar::convertToData on invalid file | Stanislav Malyshev | 2015-07-07 | 3 | -34/+50 |
| | | |||||
* | | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 | Stanislav Malyshev | 2015-07-07 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | * 'PHP-5.5' of git.php.net:php-src: add missing second argument for ucfirst to the proto | ||||
| * \ | Merge branch 'PHP-5.4' into PHP-5.5 | Ferenc Kovacs | 2015-07-07 | 1 | -1/+1 |
| |\ \ | | |/ | | | | | | | | | | * PHP-5.4: add missing second argument for ucfirst to the proto | ||||
| | * | add missing second argument for ucfirst to the proto | Ferenc Kovacs | 2015-07-07 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2015-07-07 | 2 | -0/+3 |
|\ \ \ | | | | | | | | | | | | | | | | | * PHP-5.4: Better fix for bug #69958 | ||||
| * | | | Better fix for bug #69958 | Stanislav Malyshev | 2015-07-07 | 2 | -9/+15 |
| | | | | |||||
* | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2015-07-06 | 1 | -9/+13 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Better fix for bug #69958 | ||||
| * | | | | Better fix for bug #69958 | Stanislav Malyshev | 2015-07-06 | 1 | -9/+13 |
| |/ / / | |||||
* | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2015-07-06 | 5 | -58/+94 |
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | | | | | | | | | | | | | | | | * PHP-5.4: Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM) Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath Fix bug #69958 - Segfault in Phar::convertToData on invalid file Conflicts: ext/mysqlnd/mysqlnd.c | ||||
| * | | Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM) | Stanislav Malyshev | 2015-07-06 | 1 | -25/+40 |
| | | | |||||
| * | | Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath | Stanislav Malyshev | 2015-07-04 | 1 | -2/+8 |
| | | | |||||
| * | | Fix bug #69958 - Segfault in Phar::convertToData on invalid file | Stanislav Malyshev | 2015-07-04 | 3 | -34/+50 |
| |/ | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2015-06-28 | 3 | -3/+88 |
|\ \ | |/ | | | | | | | | | * PHP-5.4: Move strlen() check to php_mail_detect_multiple_crlf() Fixed Bug #69874 : Can't set empty additional_headers for mail() | ||||
| * | Merge branch 'pull-request/1350' into PHP-5.4 | Stanislav Malyshev | 2015-06-28 | 3 | -3/+88 |
| |\ | | | | | | | | | | | | | | | | * pull-request/1350: Move strlen() check to php_mail_detect_multiple_crlf() Fixed Bug #69874 : Can't set empty additional_headers for mail() | ||||
| | * | Move strlen() check to php_mail_detect_multiple_crlf() | Yasuo Ohgaki | 2015-06-19 | 1 | -2/+2 |
| | | | |||||
| | * | Fixed Bug #69874 : Can't set empty additional_headers for mail() | Yasuo Ohgaki | 2015-06-19 | 2 | -1/+43 |
| | | | |||||
* | | | fix unknown size of void error | Anatol Belski | 2015-06-25 | 1 | -1/+1 |
| | | | |||||
* | | | Made bug44295-win.phpt locale independent | Christoph M. Becker | 2015-06-24 | 1 | -2/+2 |
| | | | | | | | | | | | | Formerly it failed on non English installations. | ||||
* | | | Merge branch 'PHP-5.4' into PHP-5.5 | Christoph M. Becker | 2015-06-24 | 3 | -2/+9 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | * PHP-5.4: updated NEWS Fixed bug #69768 (escapeshell*() doesn't cater to !) bump API version to 6.8 | ||||
| * | | Fixed bug #69768 (escapeshell*() doesn't cater to !) | Christoph M. Becker | 2015-06-24 | 3 | -2/+9 |
| |/ | | | | | | | | | | | When delayed variable substitution is enabled (can be set in the Registry, for instance), !ENV! works similar to %ENV%, and so ! should be escaped like %. | ||||
* | | Fixed Bug #53823 (preg_replace: * qualifier on unicode replace garbles the ↵ | Christoph M. Becker | 2015-06-23 | 3 | -4/+87 |
| | | | | | | | | | | | | | | | | string) When advancing after empty matches, php_pcre_match_impl() as well as php_pcre_replace_impl() always have to advance to the next code point when the u modifier is given, instead of to the next byte. | ||||
* | | Fixed bug #69864 (Segfault in preg_replace_callback) | Christoph M. Becker | 2015-06-23 | 2 | -6/+54 |
| | | | | | | | | | | When preg_replace_callback() is used, cache entries which are in use must not be removed. We ensure that by deploying a simple refcounting mechanism. | ||||
* | | Merge branch 'patch-3' of https://github.com/s0ph1e/php-src into PHP-5.5 | Xinchen Hui | 2015-06-19 | 1 | -1/+0 |
|\ \ | |||||
| * | | Remove excess variable in mail.c (5.5 branch) | Sophia Nepochataya | 2015-06-18 | 1 | -1/+0 |
| | | | |||||
* | | | fixes bug #69835: phpinfo() does not report many Windows SKUs | Christian Wenz | 2015-06-18 | 2 | -51/+275 |
|/ / | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Lior Kaplan | 2015-06-18 | 1 | -2/+2 |
|\ \ | |/ | | | | | | | * PHP-5.4: Fixed bug #69689 (Align PCRE_MINOR with current version) | ||||
| * | Fixed bug #69689 (Align PCRE_MINOR with current version) | Lior Kaplan | 2015-06-18 | 1 | -2/+2 |
| | | |||||
* | | Fix buffer growth in sockets/conversion.c | Sara Golemon | 2015-06-17 | 1 | -2/+2 |
| | | | | | | | | | | | | | | memset() the *end* of the new buffer, not the beginning Copy the pointer to the buffer, not its initial contents Fixes bug 69619 | ||||
* | | Fixed bug #61221 - imagegammacorrect function loses alpha channel | Christoph M. Becker | 2015-06-17 | 2 | -2/+26 |
| | | | | | | | | When applying imagegammacorrect() the alpha channel is now fully retained, instead of being completely lost. | ||||
* | | - Updated to version 2015.5 (2015e) | Derick Rethans | 2015-06-15 | 1 | -587/+0 |
| | | |||||
* | | - Updated to version 2015.5 (2015e) | Derick Rethans | 2015-06-15 | 1 | -6/+46213 |
| | | |||||
* | | - Updated to version .-96 () | Derick Rethans | 2015-06-15 | 1 | -45590/+7 |
| | | |||||
* | | Fix copy/paste error in test | Matteo Beccati | 2015-06-13 | 1 | -1/+1 |
| | | |||||
* | | Fix bug #69344 (PDO PgSQL Incorrect binding numeric array with gaps) | Matteo Beccati | 2015-06-12 | 2 | -2/+46 |
| | | |||||
* | | Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading ↵ | Matteo Beccati | 2015-06-12 | 2 | -31/+91 |
| | | | | | | | | single quote) | ||||
* | | rework that test to allow delta for rounding errors | Anatol Belski | 2015-06-11 | 1 | -1/+2 |
| | | | | | | | | | | If this workout doesn't make travis happy, the patch needs to be reviewed as the leak might still persist. | ||||
* | | improve test | Anatol Belski | 2015-06-11 | 1 | -1/+1 |
| | | |||||
* | | added test for bug #69646 | Anatol Belski | 2015-06-11 | 1 | -0/+47 |
| | | |||||
* | | fix bad copypaste | Stanislav Malyshev | 2015-06-11 | 1 | -2/+2 |
| | | |||||
* | | fix memory leak in pdo_pgsql closeCursor (bug 69752) | Philip Hofstetter | 2015-06-10 | 2 | -1/+61 |
| | | | | | | | | | | | | | | | | | | | | the parent PDO closeCursor method resets the pdo_stmt_t's executed flag which is used by the postgres driver as a flag to check whether to allocate memory for the column data or not. This means that after the parent closeCursor() has been called, the pdo_pgsql driver will allocate a new buffer for the columns, so the existing buffer should be freed when the cursor is being closed. | ||||
* | | Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as ↵ | Christian Wenz | 2015-06-10 | 1 | -2/+17 |
| | | | | | | | | "Business" | ||||
* | | Revert "Fix #69781: phpinfo() reports Professional Editions of Windows ↵ | Christian Wenz | 2015-06-10 | 1 | -17/+2 |
| | | | | | | | | | | | | 7/8/8.1/10 as "Business"" This reverts commit 4a05c81b85336b76d05017cc86372fbd04871e3f. | ||||
* | | Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as ↵ | Christian Wenz | 2015-06-10 | 1 | -2/+17 |
| | | | | | | | | "Business" | ||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2015-06-09 | 2 | -0/+373 |
|\ \ | |/ | | | | | | | * PHP-5.4: Fixed bug #68776 | ||||
| * | Fixed bug #68776 | Yasuo Ohgaki | 2015-06-09 | 2 | -0/+373 |
| | | |||||
* | | Merge branch 'PHp-5.4' into PHP-5.5 | Stanislav Malyshev | 2015-06-09 | 1 | -2/+2 |
|\ \ | |/ | | | | | | | | | * PHp-5.4: fix test update NEWS |