Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | PHP 5.5.0alpha1php-5.5.0alpha1 | David Soria Parra | 2012-11-13 | 3 | -4/+4 |
| | |||||
* | Bump API versions | David Soria Parra | 2012-11-13 | 3 | -3/+3 |
| | |||||
* | Merge branch 'PHP-5.4' into PHP-5.5 | Anatoliy Belsky | 2012-11-13 | 1 | -10/+10 |
|\ | | | | | | | | | * PHP-5.4: Enabled apache 2.4 handler build option | ||||
| * | Merge branch 'PHP-5.3' into PHP-5.4 | Anatoliy Belsky | 2012-11-13 | 1 | -10/+10 |
| |\ | | | | | | | | | | | | | | | | | | | | | | * PHP-5.3: Enabled apache 2.4 handler build option Conflicts: sapi/apache2handler/config.w32 | ||||
| | * | Enabled apache 2.4 handler build option | Pierre Joye | 2012-11-13 | 1 | -0/+19 |
| | | | |||||
* | | | Build .xz archive during makedist | David Soria Parra | 2012-11-13 | 1 | -1/+7 |
| | | | |||||
* | | | NEWS: remove dots at the end of the NEWS file | David Soria Parra | 2012-11-13 | 1 | -3/+3 |
| | | | |||||
* | | | PHP-5.5 is open | David Soria Parra | 2012-11-13 | 1 | -4/+6 |
| | | | |||||
* | | | Add missing parts from UPGRADING to NEWS | David Soria Parra | 2012-11-13 | 1 | -5/+12 |
| | | | |||||
* | | | Fixed sockets ext build on win | Anatoliy Belsky | 2012-11-13 | 2 | -0/+4 |
| | | | |||||
* | | | Merge branch 'PHP-5.4' | Derick Rethans | 2012-11-13 | 1 | -540/+572 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.3' into PHP-5.4 | Derick Rethans | 2012-11-13 | 1 | -540/+572 |
| |\ \ | | |/ | | | | | | | | | | Conflicts: NEWS | ||||
| | * | - Updated to version 2012.10 (2012j) | Derick Rethans | 2012-11-13 | 1 | -540/+572 |
| | | | |||||
| | * | Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3 | Derick Rethans | 2012-11-13 | 18 | -24/+225 |
| | |\ | |||||
| | | * | fix invalid read when trimming empty string | Antony Dovgal | 2012-11-11 | 1 | -2/+4 |
| | | | | |||||
| | | * | - BFN | Felipe Pena | 2012-11-09 | 1 | -0/+4 |
| | | | | |||||
| * | | | Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4 | Derick Rethans | 2012-11-13 | 20 | -25/+262 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'master' of git.php.net:/php-src | Derick Rethans | 2012-11-13 | 10 | -7/+172 |
|\ \ \ \ \ | |||||
| * | | | | | List ext/intl changes also in NEWS | Gustavo Lopes | 2012-11-12 | 1 | -0/+83 |
| | | | | | | |||||
| * | | | | | Merge branch 'PHP-5.4' | Adam Harvey | 2012-11-12 | 1 | -1/+1 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Update arginfo for preg_match_all() to reflect reality. fix invalid read when trimming empty string | ||||
| | * | | | | Merge branch 'preg_match_all_arginfo' into PHP-5.4 | Adam Harvey | 2012-11-12 | 1 | -1/+1 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * preg_match_all_arginfo: Update arginfo for preg_match_all() to reflect reality. | ||||
| | | * | | | | Update arginfo for preg_match_all() to reflect reality. | Adam Harvey | 2012-11-12 | 1 | -1/+1 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Back when I implemented FR #53238 during the 5.4 development phase to make the $matches parameter optional in preg_match_all(), it turns out I forgot to update the arginfo to note that only 2 parameters are now required by preg_match_all(). The function itself works fine, but reflection was reporting the wrong number of required parameters. | ||||
| | * | | | | fix invalid read when trimming empty string | Antony Dovgal | 2012-11-11 | 1 | -2/+4 |
| | | | | | | |||||
| * | | | | | make failed tests fail the test target | Bernhard K. Weisshuhn | 2012-11-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't see any reason to ignore failed tests. This makes it unnecessarily difficult to use ci, also for module builds. | ||||
| * | | | | | fix invalid read when trimming empty string | Antony Dovgal | 2012-11-11 | 1 | -2/+4 |
| | | | | | | |||||
| * | | | | | Merge branch 'PHP-5.4' | Felipe Pena | 2012-11-09 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | * PHP-5.4: - Fixed bug #63451 (config.guess file does not have AIX 7 defined, shared objects are not created) | ||||
| | * | | | | Merge branch 'PHP-5.3' into PHP-5.4 | Felipe Pena | 2012-11-09 | 1 | -1/+1 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | * PHP-5.3: - Fixed bug #63451 (config.guess file does not have AIX 7 defined, shared objects are not created) | ||||
| | | * | | | - Fixed bug #63451 (config.guess file does not have AIX 7 defined, shared ↵ | Felipe Pena | 2012-11-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | objects are not created) | ||||
| * | | | | | Merge branch 'PHP-5.4' | Johannes Schlüter | 2012-11-08 | 0 | -0/+0 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge branch 'PHP-5.3' into PHP-5.4 | Johannes Schlüter | 2012-11-08 | 0 | -0/+0 |
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.in main/php_version.h | ||||
| | | * | | | This will be PHP 5.3.20 | Johannes Schlüter | 2012-11-08 | 3 | -4/+11 |
| | | | | | | |||||
| * | | | | | Merge branch 'PHP-5.4' | Stanislav Malyshev | 2012-11-07 | 0 | -0/+0 |
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | * PHP-5.4: fix NEWS | ||||
| | * | | | | fix NEWS | Stanislav Malyshev | 2012-11-07 | 1 | -0/+4 |
| | | | | | | |||||
| * | | | | | Merge branch 'PHP-5.4' | Xinchen Hui | 2012-11-07 | 4 | -0/+80 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2012-11-07 | 4 | -0/+80 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Fixed bug #63447 (max_input_vars doesn't filter variables when ↵ | Xinchen Hui | 2012-11-07 | 5 | -0/+84 |
| | | | | | | | | | | | | | | | | | | | | | | | | mbstring.encoding_translation = On) | ||||
| | * | | | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2012-11-06 | 0 | -0/+0 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | News entry for png memleak fix | Rasmus Lerdorf | 2012-11-05 | 1 | -0/+1 |
| | | | | | | |||||
| | | * | | | Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3 | Rasmus Lerdorf | 2012-11-05 | 76 | -29002/+40359 |
| | | |\ \ \ | |||||
| | | * | | | | These need to be volatile in order to prevent leaking after the | Rasmus Lerdorf | 2012-11-05 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | longjmp in the error handler | ||||
| | * | | | | | News entry for png memleak fix | Rasmus Lerdorf | 2012-11-05 | 1 | -0/+1 |
| | | | | | | | |||||
| | * | | | | | These need to be volatile in order to prevent leaking after the | Rasmus Lerdorf | 2012-11-05 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | longjmp in the error handler | ||||
| * | | | | | | These need to be volatile in order to prevent leaking after the | Rasmus Lerdorf | 2012-11-05 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | longjmp in the error handler | ||||
* | | | | | | | Merge branch 'PHP-5.4' | Derick Rethans | 2012-11-04 | 1 | -29/+29 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge branch 'PHP-5.3' into PHP-5.4 | Derick Rethans | 2012-11-04 | 1 | -29/+29 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | - Updated to version 2012.9 (2012i) | Derick Rethans | 2012-11-04 | 1 | -29/+29 |
| | | | | | | |||||
* | | | | | | Fixed bug #63428 (The behavior of execute() changed) | Xinchen Hui | 2012-11-04 | 3 | -14/+12 |
| | | | | | | |||||
* | | | | | | The /e modifier is deprecated | Xinchen Hui | 2012-11-04 | 1 | -29/+44 |
| | | | | | | |||||
* | | | | | | Merge branch 'PHP-5.4' | Xinchen Hui | 2012-11-02 | 1 | -1/+4 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge branch 'PHP-5.3' into PHP-5.4 | Xinchen Hui | 2012-11-02 | 2 | -2/+7 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | |