Remi Collet [Sat, 24 Nov 2012 16:47:51 +0000 (17:47 +0100)]
Fixed Bug #63149 Feature missing with system SQLite
In pdo_sqlite, getColumnMeta should return the table name.
With bundled SQLite library, -DSQLITE_ENABLE_COLUMN_METADATA=1 (other_flags)
enable the feature in SQLite (function sqlite3_column_table_name).
With system SQLite library, this fix detects if sqlite3_column_table_name is
available and add SQLITE_ENABLE_COLUMN_METADATA macro to get the same behavior.
Test already exists: ext/pdo_sqlite/tests/bug_42589.phpt
Adam Harvey [Wed, 21 Nov 2012 01:25:05 +0000 (09:25 +0800)]
Add the new password functions to UPGRADING.
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. :)
Adam Harvey [Wed, 21 Nov 2012 01:22:03 +0000 (09:22 +0800)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Fixed bug #63468 (wrong called method as callback with inheritance)
Add actual branch version number to UPGRADING
Remove PHP 5.5 changes from master UPGRADING
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
Fixed ext/intl/tests/timezone_createDefault_basic.phpt
Skip test if directory does not exist
Dmitry Stogov [Tue, 20 Nov 2012 09:17:21 +0000 (13:17 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Fixed bug #63468 (wrong called method as callback with inheritance)
Add actual branch version number to UPGRADING
Put the new php.ini directives together.
Move the deprecated functions up to the Deprecated Functionality section so they're more visible.
Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' 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.5' of https://git.php.net/repository/php-src into PHP-5.5
* '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
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
* '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.3' of https://git.php.net/repository/php-src into PHP-5.3
* '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 'master' of https://git.php.net/repository/php-src
* 'master' 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
Leftover: Bump version to 5.6.0
Fixed test sapi/cli/tests/006.phpt
Fixed compiler reenterability
Fixed compiler reenterability
Updated NEWS
UPdated NEWS
Updated NEWS
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
* '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
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
* '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
Adam Harvey [Thu, 15 Nov 2012 01:31:45 +0000 (09:31 +0800)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src: (24 commits)
Fixed ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
Leftover: Bump version to 5.6.0
Fixed test sapi/cli/tests/006.phpt
Fixed compiler reenterability
Fixed compiler reenterability
Updated NEWS
UPdated NEWS
Updated NEWS
Bump API versions
Bump version to 5.6.0
Enabled apache 2.4 handler build option
Bump version to 5.5.99 and reset NEWS
Build .xz archive during makedist
NEWS: remove dots at the end of the NEWS file
PHP-5.5 is open
Add missing parts from UPGRADING to NEWS
Fixed sockets ext build on win
- Updated to version 2012.10 (2012j)
List ext/intl changes also in NEWS
Update arginfo for preg_match_all() to reflect reality.
...
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.
projects / php / log