summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * fix testStanislav Malyshev2015-08-041-4/+7
| |
| * update NEWSStanislav Malyshev2015-08-041-2/+30
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-08-0421-151/+398
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Fix bug #70019 - limit extracted files to given directory Do not do convert_to_* on unserialize, it messes up references Fix #69793 - limit what we accept when unserializing exception Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList) Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject ignore signatures for packages too Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage Fixed bug #69892 Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes Improved fix for Bug #69441 Fix bug #70068 (Dangling pointer in the unserialization of ArrayObject items) Fix bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref) Fix bug #70081: check types for SOAP variables Conflicts: .gitignore ext/date/php_date.c ext/spl/spl_array.c ext/spl/spl_observer.c
| * Merge branch 'PHP-5.4' into PHP-5.4.44Stanislav Malyshev2015-08-044-9/+21
| |\ | | | | | | | | | | | | | | | * PHP-5.4: Fixed bug #69892 Adjust Git-Rules
| | * Fixed bug #69892Nikita Popov2015-08-013-3/+15
| | |
| * | Fix bug #70019 - limit extracted files to given directoryStanislav Malyshev2015-08-043-4/+68
| | |
| * | Do not do convert_to_* on unserialize, it messes up referencesStanislav Malyshev2015-08-043-79/+85
| | |
| * | Fix #69793 - limit what we accept when unserializing exceptionStanislav Malyshev2015-08-013-0/+46
| | |
| * | Fixed bug #70169 (Use After Free Vulnerability in unserialize() with ↵Stanislav Malyshev2015-08-012-12/+43
| | | | | | | | | | | | SplDoublyLinkedList)
| * | Fixed bug #70166 - Use After Free Vulnerability in unserialize() with ↵Stanislav Malyshev2015-08-012-0/+32
| | | | | | | | | | | | SPLArrayObject
| * | ignore signatures for packages tooStanislav Malyshev2015-08-012-3/+22
| | |
| * | Fix bug #70168 - Use After Free Vulnerability in unserialize() with ↵Stanislav Malyshev2015-08-012-33/+54
| | | | | | | | | | | | SplObjectStorage
| * | Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytesStanislav Malyshev2015-07-261-4/+2
| | |
| * | Improved fix for Bug #69441Stanislav Malyshev2015-07-261-5/+8
| | |
| * | Fix bug #70068 (Dangling pointer in the unserialization of ArrayObject items)Stanislav Malyshev2015-07-262-43/+56
| | |
| * | Fix bug #70121 (unserialize() could lead to unexpected methods execution / ↵Stanislav Malyshev2015-07-262-8/+18
| | | | | | | | | | | | NULL pointer deref)
| * | Fix bug #70081: check types for SOAP variablesStanislav Malyshev2015-07-261-10/+13
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Julien Pauli2015-07-291-6/+6
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Adjust Git-Rules 5.4.44 next Conflicts: configure.in main/php_version.h
| * | Adjust Git-RulesJulien Pauli2015-07-291-6/+6
| |/
| * 5.4.44 nextStanislav Malyshev2015-07-073-4/+6
| |
* | Fixed bug #70002 TS issues with temporary dir handlingAnatol Belski2015-07-282-2/+13
| |
* | make the travis irc notification a onelinerFerenc Kovacs2015-07-261-0/+2
| |
* | 5.5.27 releaseJulien Pauli2015-07-082-2/+13
| |
* | 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
| |
| * update newsStanislav Malyshev2015-07-071-1/+10
| |
| * 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-060-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-5.4: update news
| * | | update newsStanislav Malyshev2015-07-061-1/+10
| | | |
* | | | 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-284-3/+90
| |\ | | | | | | | | | | | | | | | * 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
| | |
* | | 5.5.28 now - Security OnlyJulien Pauli2015-06-243-4/+8
| | |
* | | Made bug44295-win.phpt locale independentChristoph M. Becker2015-06-241-2/+2
| | | | | | | | | | | | Formerly it failed on non English installations.
* | | updated NEWSChristoph M. Becker2015-06-241-0/+1
| | |