summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* PHP 5.5.0alpha1php-5.5.0alpha1David Soria Parra2012-11-133-4/+4
|
* Bump API versionsDavid Soria Parra2012-11-133-3/+3
|
* Merge branch 'PHP-5.4' into PHP-5.5Anatoliy Belsky2012-11-131-10/+10
|\ | | | | | | | | * PHP-5.4: Enabled apache 2.4 handler build option
| * Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-11-131-10/+10
| |\ | | | | | | | | | | | | | | | | | | | | | * PHP-5.3: Enabled apache 2.4 handler build option Conflicts: sapi/apache2handler/config.w32
| | * Enabled apache 2.4 handler build optionPierre Joye2012-11-131-0/+19
| | |
* | | Build .xz archive during makedistDavid Soria Parra2012-11-131-1/+7
| | |
* | | NEWS: remove dots at the end of the NEWS fileDavid Soria Parra2012-11-131-3/+3
| | |
* | | PHP-5.5 is openDavid Soria Parra2012-11-131-4/+6
| | |
* | | Add missing parts from UPGRADING to NEWSDavid Soria Parra2012-11-131-5/+12
| | |
* | | Fixed sockets ext build on winAnatoliy Belsky2012-11-132-0/+4
| | |
* | | Merge branch 'PHP-5.4'Derick Rethans2012-11-131-540/+572
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Derick Rethans2012-11-131-540/+572
| |\ \ | | |/ | | | | | | | | | Conflicts: NEWS
| | * - Updated to version 2012.10 (2012j)Derick Rethans2012-11-131-540/+572
| | |
| | * Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3Derick Rethans2012-11-1318-24/+225
| | |\
| | | * fix invalid read when trimming empty stringAntony Dovgal2012-11-111-2/+4
| | | |
| | | * - BFNFelipe Pena2012-11-091-0/+4
| | | |
| * | | Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4Derick Rethans2012-11-1320-25/+262
| |\ \ \
* | \ \ \ Merge branch 'master' of git.php.net:/php-srcDerick Rethans2012-11-1310-7/+172
|\ \ \ \ \
| * | | | | List ext/intl changes also in NEWSGustavo Lopes2012-11-121-0/+83
| | | | | |
| * | | | | Merge branch 'PHP-5.4'Adam Harvey2012-11-121-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.4Adam Harvey2012-11-121-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 Harvey2012-11-121-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 stringAntony Dovgal2012-11-111-2/+4
| | | | | |
| * | | | | make failed tests fail the test targetBernhard K. Weisshuhn2012-11-111-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 stringAntony Dovgal2012-11-111-2/+4
| | | | | |
| * | | | | Merge branch 'PHP-5.4'Felipe Pena2012-11-091-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.4Felipe Pena2012-11-091-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 Pena2012-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | objects are not created)
| * | | | | Merge branch 'PHP-5.4'Johannes Schlüter2012-11-080-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'PHP-5.3' into PHP-5.4Johannes Schlüter2012-11-080-0/+0
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.in main/php_version.h
| | | * | | This will be PHP 5.3.20Johannes Schlüter2012-11-083-4/+11
| | | | | |
| * | | | | Merge branch 'PHP-5.4'Stanislav Malyshev2012-11-070-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * PHP-5.4: fix NEWS
| | * | | | fix NEWSStanislav Malyshev2012-11-071-0/+4
| | | | | |
| * | | | | Merge branch 'PHP-5.4'Xinchen Hui2012-11-074-0/+80
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-11-074-0/+80
| | |\ \ \ \ | | | |/ / /
| | | * | | Fixed bug #63447 (max_input_vars doesn't filter variables when ↵Xinchen Hui2012-11-075-0/+84
| | | | | | | | | | | | | | | | | | | | | | | | mbstring.encoding_translation = On)
| | * | | | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-11-060-0/+0
| | |\ \ \ \ | | | |/ / /
| | | * | | News entry for png memleak fixRasmus Lerdorf2012-11-051-0/+1
| | | | | |
| | | * | | Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3Rasmus Lerdorf2012-11-0576-29002/+40359
| | | |\ \ \
| | | * | | | These need to be volatile in order to prevent leaking after theRasmus Lerdorf2012-11-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | longjmp in the error handler
| | * | | | | News entry for png memleak fixRasmus Lerdorf2012-11-051-0/+1
| | | | | | |
| | * | | | | These need to be volatile in order to prevent leaking after theRasmus Lerdorf2012-11-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | longjmp in the error handler
| * | | | | | These need to be volatile in order to prevent leaking after theRasmus Lerdorf2012-11-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | longjmp in the error handler
* | | | | | | Merge branch 'PHP-5.4'Derick Rethans2012-11-041-29/+29
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'PHP-5.3' into PHP-5.4Derick Rethans2012-11-041-29/+29
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | - Updated to version 2012.9 (2012i)Derick Rethans2012-11-041-29/+29
| | | | | |
* | | | | | Fixed bug #63428 (The behavior of execute() changed)Xinchen Hui2012-11-043-14/+12
| | | | | |
* | | | | | The /e modifier is deprecatedXinchen Hui2012-11-041-29/+44
| | | | | |
* | | | | | Merge branch 'PHP-5.4'Xinchen Hui2012-11-021-1/+4
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-11-022-2/+7
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |