archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-5.5'

Browse source 
* 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
This commit is contained in:
Stanislav Malyshev 2013-07-21 21:17:59 -07:00
commit 1a05648e6d
4 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
php.ini-development
View file

@ -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