summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Add myself to QADavid Soria Parra2012-11-211-1/+1
| | | | |
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2012-11-211-4/+0
|\ \ \ \ \ | |/ / / /
| * | | | Unused variable copystrXinchen Hui2012-11-211-4/+0
| | | | | | | | | | | | | | | | | | | | copystr is declared again blow
* | | | | Update credits for 5.5Xinchen Hui2012-11-212-5/+5
| | | | |
* | | | | Add the new password functions to UPGRADING.Adam Harvey2012-11-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a public service announcement on behalf of the documentation team, please remember to update UPGRADING as well as NEWS when adding features to master or an alpha branch. :)
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2012-11-202-1/+31
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Fixed bug #63468 (wrong called method as callback with inheritance) Conflicts: NEWS
| * | | | Merge branch 'PHP-5.3' into PHP-5.4Dmitry Stogov2012-11-203-1/+33
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.3: Fixed bug #63468 (wrong called method as callback with inheritance) Conflicts: NEWS
| | * | | Fixed bug #63468 (wrong called method as callback with inheritance)Dmitry Stogov2012-11-203-1/+33
| | | | |
| | * | | Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3Christopher Jones2012-11-186-1368/+1397
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'PHP-5.3' of https://git.php.net/repository/php-src: Regenerate Zend ini scanner Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value
| | * \ \ \ Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3Christopher Jones2012-11-153-0/+8
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'PHP-5.3' of https://git.php.net/repository/php-src: Skip test if directory does not exist Updated NEWS
| * | \ \ \ \ Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4Christopher Jones2012-11-185-1368/+1394
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'PHP-5.4' of https://git.php.net/repository/php-src: Regenerate Zend ini scanner Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value
| * \ \ \ \ \ \ Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4Christopher Jones2012-11-158-343/+356
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'PHP-5.4' of https://git.php.net/repository/php-src: Skip test if directory does not exist Fixed test sapi/cli/tests/006.phpt Fixed compiler reenterability Fixed compiler reenterability UPdated NEWS Updated NEWS
* | \ \ \ \ \ \ \ Merge branch 'add_ver_to_upgrading' into PHP-5.5Christopher Jones2012-11-181-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add_ver_to_upgrading: Add actual branch version number to UPGRADING
| * | | | | | | | | Add actual branch version number to UPGRADINGChristopher Jones2012-11-181-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5Christopher Jones2012-11-186-1378/+1408
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'PHP-5.5' of https://git.php.net/repository/php-src: Put the new php.ini directives together. Move the deprecated functions up to the Deprecated Functionality section so they're more visible. Regenerate Zend ini scanner Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value
| * | | | | | | | | Put the new php.ini directives together.Adam Harvey2012-11-181-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (And make colon usage more consistent.)
| * | | | | | | | | Move the deprecated functions up to the Deprecated Functionality section soAdam Harvey2012-11-181-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | they're more visible.
| * | | | | | | | | Merge branch 'PHP-5.4' into PHP-5.5Pierrick Charron2012-11-162-1349/+1335
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Regenerate Zend ini scanner Conflicts: Zend/zend_ini_scanner.c Zend/zend_ini_scanner_defs.h
| | * | | | | | | | Merge branch 'PHP-5.3' into PHP-5.4Pierrick Charron2012-11-162-1349/+1335
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.3: Regenerate Zend ini scanner Conflicts: Zend/zend_ini_scanner.c Zend/zend_ini_scanner_defs.h
| | | * | | | | | | Regenerate Zend ini scannerPierrick Charron2012-11-162-1349/+1335
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regenerate both zend_ini_scanner.c and zend_ini_scanner_defs.h
| * | | | | | | | | Merge branch 'PHP-5.4' into PHP-5.5Pierrick Charron2012-11-163-19/+59
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value
| | * | | | | | | | Merge branch 'PHP-5.3' into PHP-5.4Pierrick Charron2012-11-163-19/+59
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | / / / / / | | | |_|/ / / / / | | |/| | | | | | * PHP-5.3: Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value
| | | * | | | | | Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from valuePierrick Charron2012-11-164-19/+62
| | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | Restore the old behavior but keep bug 51094 fixed
* | | | | | | | Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5Christopher Jones2012-11-1510-354/+380
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'PHP-5.5' of https://git.php.net/repository/php-src: Fixed ext/intl/tests/timezone_createDefault_basic.phpt Skip test if directory does not exist Fixed ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt Fixed test sapi/cli/tests/006.phpt Fixed compiler reenterability Fixed compiler reenterability Updated NEWS UPdated NEWS Updated NEWS
| * | | | | | | Fixed ext/intl/tests/timezone_createDefault_basic.phptAnatoliy Belsky2012-11-151-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Timezone offsets can be negative
| * | | | | | | Merge branch 'PHP-5.4' into PHP-5.5Johannes Schlüter2012-11-151-0/+3
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch 'PHP-5.3' into PHP-5.4Johannes Schlüter2012-11-151-0/+3
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Skip test if directory does not existJohannes Schlüter2012-11-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Would be good to run this using a directory which is existing everywhere.
| * | | | | | | Fixed ext/pdo_mysql/tests/pdo_mysql_class_constants.phptAnatoliy Belsky2012-11-141-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a constant now which only is there when mysqli with mysqlnd and pdo_mysql was compiled at the same time, or when libmysql version > 50605. So checking for that dynamically, will fail only if there is no mysqli and no connection.
| * | | | | | | Merge branch 'PHP-5.4' into PHP-5.5Anatoliy Belsky2012-11-141-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Fixed test sapi/cli/tests/006.phpt
| | * | | | | | Fixed test sapi/cli/tests/006.phptAnatoliy Belsky2012-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Third param in preg_match_all() is optional for a while )
| * | | | | | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2012-11-144-346/+351
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Fixed compiler reenterability Fixed compiler reenterability Conflicts: Zend/zend_language_scanner.c Zend/zend_language_scanner_defs.h
| | * | | | | | Fixed compiler reenterabilityDmitry Stogov2012-11-142-342/+344
| | | | | | | |
| | * | | | | | Fixed compiler reenterabilityDmitry Stogov2012-11-142-0/+3
| | | | | | | |
| * | | | | | | Updated NEWSAnatoliy Belsky2012-11-142-2/+12
| | | | | | | |
| * | | | | | | Merge branch 'PHP-5.4' into PHP-5.5Anatoliy Belsky2012-11-140-0/+0
| |\ \ \ \ \ \ \ |/ / / / / / / / | | _ / / / / / | | / / / / / | | | | | | | | | | | | | | * PHP-5.4: UPdated NEWS Updated NEWS
| * | | | | | UPdated NEWSAnatoliy Belsky2012-11-142-0/+5
| | | | | | |
| * | | | | | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-11-140-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | / / / / | | |/ / / / | |/| | | | * PHP-5.3: Updated NEWS
| | * | | | Updated NEWSAnatoliy Belsky2012-11-142-0/+5
| | |/ / /
* | | | | 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