summaryrefslogtreecommitdiff
path: root/ext
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-07-071-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 #69958Stanislav Malyshev2015-07-072-9/+15
| |
| * Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)Stanislav Malyshev2015-07-071-25/+40
| |
| * Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepathStanislav Malyshev2015-07-071-2/+8
| |
| * Fix bug #69958 - Segfault in Phar::convertToData on invalid fileStanislav Malyshev2015-07-073-34/+50
| |
* | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Stanislav Malyshev2015-07-071-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.5Ferenc Kovacs2015-07-071-1/+1
| |\ \ | | |/ | | | | | | | | | * PHP-5.4: add missing second argument for ucfirst to the proto
| | * add missing second argument for ucfirst to the protoFerenc Kovacs2015-07-071-1/+1
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-07-072-0/+3
|\ \ \ | | | | | | | | | | | | | | | | * PHP-5.4: Better fix for bug #69958
| * | | Better fix for bug #69958Stanislav Malyshev2015-07-072-9/+15
| | | |
* | | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-07-061-9/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Better fix for bug #69958
| * | | | Better fix for bug #69958Stanislav Malyshev2015-07-061-9/+13
| |/ / /
* | | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-07-065-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 Malyshev2015-07-061-25/+40
| | |
| * | Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepathStanislav Malyshev2015-07-041-2/+8
| | |
| * | Fix bug #69958 - Segfault in Phar::convertToData on invalid fileStanislav Malyshev2015-07-043-34/+50
| |/
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-06-283-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.4Stanislav Malyshev2015-06-283-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 Ohgaki2015-06-191-2/+2
| | |
| | * Fixed Bug #69874 : Can't set empty additional_headers for mail()Yasuo Ohgaki2015-06-192-1/+43
| | |
* | | fix unknown size of void errorAnatol Belski2015-06-251-1/+1
| | |
* | | Made bug44295-win.phpt locale independentChristoph M. Becker2015-06-241-2/+2
| | | | | | | | | | | | Formerly it failed on non English installations.
* | | Merge branch 'PHP-5.4' into PHP-5.5Christoph M. Becker2015-06-243-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. Becker2015-06-243-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. Becker2015-06-233-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. Becker2015-06-232-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.5Xinchen Hui2015-06-191-1/+0
|\ \
| * | Remove excess variable in mail.c (5.5 branch)Sophia Nepochataya2015-06-181-1/+0
| | |
* | | fixes bug #69835: phpinfo() does not report many Windows SKUsChristian Wenz2015-06-182-51/+275
|/ /
* | Merge branch 'PHP-5.4' into PHP-5.5Lior Kaplan2015-06-181-2/+2
|\ \ | |/ | | | | | | * PHP-5.4: Fixed bug #69689 (Align PCRE_MINOR with current version)
| * Fixed bug #69689 (Align PCRE_MINOR with current version)Lior Kaplan2015-06-181-2/+2
| |
* | Fix buffer growth in sockets/conversion.cSara Golemon2015-06-171-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 channelChristoph M. Becker2015-06-172-2/+26
| | | | | | | | When applying imagegammacorrect() the alpha channel is now fully retained, instead of being completely lost.
* | - Updated to version 2015.5 (2015e)Derick Rethans2015-06-151-587/+0
| |
* | - Updated to version 2015.5 (2015e)Derick Rethans2015-06-151-6/+46213
| |
* | - Updated to version .-96 ()Derick Rethans2015-06-151-45590/+7
| |
* | Fix copy/paste error in testMatteo Beccati2015-06-131-1/+1
| |
* | Fix bug #69344 (PDO PgSQL Incorrect binding numeric array with gaps)Matteo Beccati2015-06-122-2/+46
| |
* | Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading ↵Matteo Beccati2015-06-122-31/+91
| | | | | | | | single quote)
* | rework that test to allow delta for rounding errorsAnatol Belski2015-06-111-1/+2
| | | | | | | | | | If this workout doesn't make travis happy, the patch needs to be reviewed as the leak might still persist.
* | improve testAnatol Belski2015-06-111-1/+1
| |
* | added test for bug #69646Anatol Belski2015-06-111-0/+47
| |
* | fix bad copypasteStanislav Malyshev2015-06-111-2/+2
| |
* | fix memory leak in pdo_pgsql closeCursor (bug 69752)Philip Hofstetter2015-06-102-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 Wenz2015-06-101-2/+17
| | | | | | | | "Business"
* | Revert "Fix #69781: phpinfo() reports Professional Editions of Windows ↵Christian Wenz2015-06-101-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 Wenz2015-06-101-2/+17
| | | | | | | | "Business"
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-06-092-0/+373
|\ \ | |/ | | | | | | * PHP-5.4: Fixed bug #68776
| * Fixed bug #68776Yasuo Ohgaki2015-06-092-0/+373
| |
* | Merge branch 'PHp-5.4' into PHP-5.5Stanislav Malyshev2015-06-091-2/+2
|\ \ | |/ | | | | | | | | * PHp-5.4: fix test update NEWS