diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-07-21 21:17:59 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-07-21 21:17:59 -0700 |
| commit | 1a05648e6ddb6af847a34e7adf4bbea45409809c (patch) | |
| tree | ff7d2056f2100b26d5ab39f1fd12223823bad3e9 /php.ini-development | |
| parent | 02457554a35fbb96fd3f51caf7deab91ca32ecb2 (diff) | |
| parent | 2c23004a1e3eb14695e6c44e52e4d5fe2a2d37d9 (diff) | |
| download | php-git-1a05648e6ddb6af847a34e7adf4bbea45409809c.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
next is 5.5.2
add a few comment
allow both the old and new cfg argument to work. (the old of course should contain the typo)
mssql.compatability_mode fix
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'php.ini-development')
| -rw-r--r-- | php.ini-development | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/php.ini-development b/php.ini-development index 05d1a9346e..3c53ffd500 100644 --- a/php.ini-development +++ b/php.ini-development @@ -1642,7 +1642,7 @@ mssql.min_error_severity = 10 mssql.min_message_severity = 10 ; Compatibility mode with old versions of PHP 3.0. -mssql.compatability_mode = Off +mssql.compatibility_mode = Off ; Connect timeout ;mssql.connect_timeout = 5 |