Changed presentation of default values for textsize and textlimit in phpinfo().

the value -1 means "Server default"

diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index 3652b82b9534b84b0f461e31b23d8d85f540ab32..16c097f74a2e21eca104c0a6b57edfaf9be18e95 100644 (file)
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -75,11 +75,7 @@ zend_module_entry mssql_module_entry = {
        STANDARD_MODULE_PROPERTIES
 };
 
-#ifdef ZTS
-int mssql_globals_id;
-#else
-PHP_MSSQL_API zend_mssql_globals mssql_globals;
-#endif
+ZEND_DECLARE_MODULE_GLOBALS(mssql)
 
 #ifdef COMPILE_DL_MSSQL
 ZEND_GET_MODULE(mssql)
@@ -87,6 +83,24 @@ ZEND_GET_MODULE(mssql)
 
 #define CHECK_LINK(link) { if (link==-1) { php_error(E_WARNING,"MS SQL:  A link to the server could not be established"); RETURN_FALSE; } }
 
+static PHP_INI_DISP(display_text_size)
+{
+       char *value;
+       
+    if (type == PHP_INI_DISPLAY_ORIG && ini_entry->modified) {
+               value = ini_entry->orig_value;
+       } else if (ini_entry->value) {
+               value = ini_entry->value;
+       } else {
+               value = NULL;
+       }
+
+       if (atoi(value) == -1) {
+               PUTS("Server default");
+       } else {
+               php_printf("%s", value);
+       }
+}
 
 PHP_INI_BEGIN()
        STD_PHP_INI_BOOLEAN("mssql.allow_persistent",           "1",    PHP_INI_SYSTEM, OnUpdateBool,   allow_persistent,                       zend_mssql_globals,             mssql_globals)
@@ -96,8 +110,8 @@ PHP_INI_BEGIN()
        STD_PHP_INI_ENTRY_EX("mssql.min_message_severity",      "10",   PHP_INI_ALL,    OnUpdateInt,    cfg_min_message_severity,       zend_mssql_globals,             mssql_globals,  display_link_numbers)
        STD_PHP_INI_BOOLEAN("mssql.compatability_mode",         "0",    PHP_INI_ALL,    OnUpdateBool,   compatability_mode,                     zend_mssql_globals,             mssql_globals)
        STD_PHP_INI_ENTRY_EX("mssql.connect_timeout",           "5",    PHP_INI_ALL,    OnUpdateInt,    connect_timeout,                        zend_mssql_globals,             mssql_globals,  display_link_numbers)
-       STD_PHP_INI_ENTRY_EX("mssql.textsize",                          "-1",   PHP_INI_ALL,    OnUpdateInt,    textsize,                                       zend_mssql_globals,             mssql_globals,  display_link_numbers)
-       STD_PHP_INI_ENTRY_EX("mssql.textlimit",                         "-1",   PHP_INI_ALL,    OnUpdateInt,    textlimit,                                      zend_mssql_globals,             mssql_globals,  display_link_numbers)
+       STD_PHP_INI_ENTRY_EX("mssql.textsize",                          "-1",   PHP_INI_ALL,    OnUpdateInt,    textsize,                                       zend_mssql_globals,             mssql_globals,  display_text_size)
+       STD_PHP_INI_ENTRY_EX("mssql.textlimit",                         "-1",   PHP_INI_ALL,    OnUpdateInt,    textlimit,                                      zend_mssql_globals,             mssql_globals,  display_text_size)
        STD_PHP_INI_ENTRY_EX("mssql.batchsize",                         "0",    PHP_INI_ALL,    OnUpdateInt,    batchsize,                                      zend_mssql_globals,             mssql_globals,  display_link_numbers)
 PHP_INI_END()