cvs: php4 / php.ini-dist php.ini-optimized

fmk Wed Nov 29 14:10:47 2000 EDT Modified files: /php4 php.ini-dist php.ini-optimized Log: The ODBC extension looks for settings named odbc. and not uodbc. Index: php4/php.ini-dist diff -u php4/php.ini-dist:1.62 php4/php.ini-dist:1.63 --- php4/php.ini-dist:1.62 Mon Nov 27 03:57:30 2000 +++ php4/php.ini-dist Wed Nov 29 14:10:46 2000 @@ -348,15 +348,15 @@ sql.safe_mode = Off [ODBC] -;uodbc.default_db = Not yet implemented -;uodbc.default_user = Not yet implemented -;uodbc.default_pw = Not yet implemented -uodbc.allow_persistent = On ; allow or prevent persistent links -uodbc.check_persistent = On ; check that a connection is still validbefore reuse -uodbc.max_persistent = -1 ; maximum number of persistent links. -1 means no limit -uodbc.max_links = -1 ; maximum number of links (persistent+non persistent). -1 means no limit -uodbc.defaultlrl = 4096 ; Handling of LONG fields. Returns number of bytes to variables, 0 means passthru -uodbc.defaultbinmode = 1 ; Handling of binary data. 0 means passthru, 1 return as is, 2 convert to char +;odbc.default_db = Not yet implemented +;odbc.default_user = Not yet implemented +;odbc.default_pw = Not yet implemented +odbc.allow_persistent = On ; allow or prevent persistent links +odbc.check_persistent = On ; check that a connection is still validbefore reuse +odbc.max_persistent = -1 ; maximum number of persistent links. -1 means no limit +odbc.max_links = -1 ; maximum number of links (persistent+non persistent). -1 means no limit +odbc.defaultlrl = 4096 ; Handling of LONG fields. Returns number of bytes to variables, 0 means passthru +odbc.defaultbinmode = 1 ; Handling of binary data. 0 means passthru, 1 return as is, 2 convert to char ; See the documentation on odbc_binmode and odbc_longreadlen for an explanation of uodbc.defaultlrl ; and uodbc.defaultbinmode Index: php4/php.ini-optimized diff -u php4/php.ini-optimized:1.28 php4/php.ini-optimized:1.29 --- php4/php.ini-optimized:1.28 Mon Nov 27 03:57:30 2000 +++ php4/php.ini-optimized Wed Nov 29 14:10:46 2000 @@ -330,15 +330,15 @@ sql.safe_mode = Off [ODBC] -;uodbc.default_db = Not yet implemented -;uodbc.default_user = Not yet implemented -;uodbc.default_pw = Not yet implemented -uodbc.allow_persistent = On ; allow or prevent persistent links -uodbc.check_persistent = On ; check that a connection is still validbefore reuse -uodbc.max_persistent = -1 ; maximum number of persistent links. -1 means no limit -uodbc.max_links = -1 ; maximum number of links (persistent+non persistent). -1 means no limit -uodbc.defaultlrl = 4096 ; Handling of LONG fields. Returns number of bytes to variables, 0 means passthru -uodbc.defaultbinmode = 1 ; Handling of binary data. 0 means passthru, 1 return as is, 2 convert to char +;odbc.default_db = Not yet implemented +;odbc.default_user = Not yet implemented +;odbc.default_pw = Not yet implemented +odbc.allow_persistent = On ; allow or prevent persistent links +odbc.check_persistent = On ; check that a connection is still validbefore reuse +odbc.max_persistent = -1 ; maximum number of persistent links. -1 means no limit +odbc.max_links = -1 ; maximum number of links (persistent+non persistent). -1 means no limit +odbc.defaultlrl = 4096 ; Handling of LONG fields. Returns number of bytes to variables, 0 means passthru +odbc.defaultbinmode = 1 ; Handling of binary data. 0 means passthru, 1 return as is, 2 convert to char ; See the documentation on odbc_binmode and odbc_longreadlen for an explanation of uodbc.defaultlrl ; and uodbc.defaultbinmode