| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Lars Strojny | 2013-01-06 | 1 | -0/+71 | |
| | |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | ||||||
| | | * | | | | | Adding test for bug #63462 | Lars Strojny | 2013-01-06 | 1 | -0/+71 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Derick Rethans | 2013-01-06 | 2 | -1/+16 | |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | | | ||||||
| | * | | | | | Merge branch 'PHP-5.3' into PHP-5.4 | Derick Rethans | 2013-01-06 | 2 | -1/+16 | |
| | |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| | | ||||||
| | | * | | | Fixed bug #55397: Comparsion of incomplete DateTime causes SIGSEGV. | Derick Rethans | 2013-01-06 | 2 | -1/+16 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Lars Strojny | 2013-01-06 | 1 | -4/+5 | |
| |\ \ \ \ \ | |/ / / / | ||||||
| | * | | | | Coding style, ANSI C compatibility | Lars Strojny | 2013-01-06 | 1 | -4/+5 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 | Xinchen Hui | 2013-01-06 | 4 | -7/+87 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Bug #23955: allow specifiy max age for setcookie() | Lars Strojny | 2013-01-06 | 4 | -7/+87 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Xinchen Hui | 2013-01-06 | 55 | -55/+55 | |
| |\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | ||||||
| | * | | | | bump year | Xinchen Hui | 2013-01-06 | 10 | -10/+10 | |
| | | | | | | ||||||
| | * | | | | Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 | Xinchen Hui | 2013-01-06 | 4 | -11/+58 | |
| | |\ \ \ \ | ||||||
| | | * | | | | Adding test from 5.5 | Lars Strojny | 2013-01-06 | 1 | -0/+11 | |
| | | | | | | | ||||||
| | | * | | | | Bug #63699: performance improvements for varios ext/date functions | Lars Strojny | 2013-01-06 | 3 | -11/+47 | |
| | | | | | | | ||||||
| | * | | | | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2013-01-06 | 45 | -45/+45 | |
| | |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | ||||||
| | | * | | | bump year | Xinchen Hui | 2013-01-06 | 45 | -45/+45 | |
| | | | | | | ||||||
| * | | | | | Bug #63699 performance improvements for ext/date by only validating timezone ↵ | Lars Strojny | 2013-01-06 | 2 | -16/+43 | |
| | | | | | | | | | | | | | | | | | | | | | when timezone is set | |||||
| * | | | | | Improve resource management for curl handle | Pierrick Charron | 2013-01-05 | 3 | -19/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous implementation was using its own refcounting (uses field of the php_curl struct). zend_list_add/remove already implements its own refcount, so we don't need to use an other one. | |||||
| * | | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Xinchen Hui | 2013-01-04 | 1 | -1/+1 | |
| |\ \ \ \ \ | |/ / / / | ||||||
| | * | | | | Update NEWS | Xinchen Hui | 2013-01-04 | 1 | -0/+1 | |
| | | | | | | ||||||
| | * | | | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2013-01-04 | 1 | -1/+1 | |
| | |\ \ \ \ | | |/ / / | ||||||
| | | * | | | Fixed bug #63899 (Use after scope error in zend_compile) | Xinchen Hui | 2013-01-04 | 2 | -1/+2 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 | Stanislav Malyshev | 2013-01-03 | 1 | -10/+2 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * 'PHP-5.5' of git.php.net:php-src: remove set but not used variables | |||||
| | * \ \ \ \ | Merge branch 'PHP-5.4' into PHP-5.5 | Johannes Schlüter | 2013-01-03 | 0 | -0/+0 | |
| | |\ \ \ \ \ | ||||||
| | * | | | | | | remove set but not used variables | Remi Collet | 2013-01-02 | 1 | -10/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2013-01-03 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: 5.4.12-dev This will be PHP 5.3.22 Conflicts: configure.in main/php_version.h | |||||
| | * | | | | | 5.4.12-dev | Stanislav Malyshev | 2013-01-03 | 3 | -4/+6 | |
| | |/ / / / | ||||||
| | * | | | | Merge branch 'PHP-5.3' into PHP-5.4 | Johannes Schlüter | 2013-01-03 | 0 | -0/+0 | |
| | |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.in main/php_version.h | |||||
| | | * | | | This will be PHP 5.3.22 | Johannes Schlüter | 2013-01-03 | 3 | -5/+7 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2013-01-01 | 0 | -0/+0 | |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | * PHP-5.4: add bug #63762 | |||||
| | * | | | | add bug #63762 | Stanislav Malyshev | 2013-01-01 | 1 | -0/+2 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2013-01-01 | 0 | -0/+0 | |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | * PHP-5.4: add fix #43177 | |||||
| | * | | | | add fix #43177 | Stanislav Malyshev | 2013-01-01 | 1 | -0/+4 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2013-01-01 | 3 | -35/+133 | |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Bug #43177: If an eval() has a parse error, the overall exit status and return code should not be affected. fix NEWS Conflicts: main/main.c | |||||
| | * | | | | Bug #43177: If an eval() has a parse error, the overall exit status and ↵ | Stanislav Malyshev | 2013-01-01 | 3 | -36/+134 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | return code should not be affected. Without this fix, a webpage using eval() may return code 500. That might display fine and the 500 go unnoticed, but using AJAX or wget, the 500 will cause problems. | |||||
| | * | | | | fix NEWS | Stanislav Malyshev | 2013-01-01 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | Remove passwd handler from struct when not needed | Pierrick Charron | 2013-01-01 | 2 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | CURLOPT_PASSWDFUNCTION was removed in cURL 7.15.5, the passwd field will not be used for version greater than this one | |||||
| * | | | | | Happy New Year | Xinchen Hui | 2013-01-01 | 759 | -769/+769 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Xinchen Hui | 2013-01-01 | 0 | -0/+0 | |
| |\ \ \ \ \ | |/ / / / | ||||||
| | * | | | | Happy New Year | Xinchen Hui | 2013-01-01 | 758 | -824/+825 | |
| | | | | | | ||||||
| | * | | | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2013-01-01 | 0 | -0/+0 | |
| | |\ \ \ \ | | |/ / / | ||||||
| | | * | | | Happy New Year | Xinchen Hui | 2013-01-01 | 96 | -98/+98 | |
| | | | | | | ||||||
| | * | | | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2013-01-01 | 0 | -0/+0 | |
| | |\ \ \ \ | | |/ / / | ||||||
| | | * | | | Happy New Year~ | Xinchen Hui | 2013-01-01 | 657 | -665/+665 | |
| | | | | | | ||||||
| * | | | | | Fixed bug #63874 (Segfaul if php_strip_whitespace has heredoc) | Pierrick Charron | 2012-12-29 | 3 | -1/+17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | T_END_HEREDOC don't carry a token value anymore since commit 4cf90e06c Bugfix by Nikita for bug #60097 | |||||
| * | | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Lars Strojny | 2012-12-29 | 2 | -0/+13 | |
| |\ \ \ \ \ | |/ / / / | ||||||
| | * | | | | News entry for +0/-0 filter fix | Lars Strojny | 2012-12-29 | 1 | -0/+2 | |
| | | | | | | ||||||
| | * | | | | Add more tests for the new +0/-0 behaviour. | Martin Jansen | 2012-12-29 | 1 | -0/+4 | |
| | | | | | | ||||||
| | * | | | | Treat "+0" and "-0" as valid integers just like var_dump() does. | Martin Jansen | 2012-12-29 | 2 | -0/+9 | |
| | | | | | | | | | | | | | | | | | | | | | This fixes bug #54096. | |||||
| * | | | | | Add new curl options | Pierrick Charron | 2012-12-28 | 2 | -0/+33 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addes new curl options CURLOPT_TELNETOPTIONS, CURLOPT_GSSAPI_DELEGATION, CURLOPT_ACCEPTTIMEOUT_MS, CURLOPT_SSL_OPTIONS, CURLOPT_TCP_KEEPALIVE, CURLOPT_TCP_KEEPIDLE and CURLOPT_TCP_KEEPINTVL. | |||||
 |
index : delta/php-git.git | |
| git.php.net: repository/php-src.git |
| summaryrefslogtreecommitdiff |