Fix PostgreSQL startup routine in thread-safe mode

2 files changed, 23 insertions, 0 deletions

diff --git a/main/php_ini.c b/main/php_ini.c
index 27ed9973a3..5e5c5f8766 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -331,6 +331,28 @@ PHP_INI_DISP(php_ini_color_displayer_cb)
 }
 
 
+PHP_INI_DISP(display_link_numbers)
+{
+	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 (value) {
+		if (atoi(value)==-1) {
+			PUTS("Unlimited");
+		} else {
+			php_printf("%s", value);
+		}
+	}
+}
+
+
 static int php_ini_displayer(php_ini_entry *ini_entry, int module_number)
 {
 	if (ini_entry->module_number != module_number) {
diff --git a/main/php_ini.h b/main/php_ini.h
index c805347ab8..cc13ee468c 100644
--- a/main/php_ini.h
+++ b/main/php_ini.h
@@ -70,6 +70,7 @@ php_ini_entry *get_ini_entry(char *name, uint name_length);
 PHPAPI int php_ini_register_displayer(char *name, uint name_length, void (*displayer)(php_ini_entry *ini_entry, int type));
 PHPAPI PHP_INI_DISP(php_ini_boolean_displayer_cb);
 PHPAPI PHP_INI_DISP(php_ini_color_displayer_cb);
+PHPAPI PHP_INI_DISP(display_link_numbers);
 
 #define PHP_INI_BEGIN()		static php_ini_entry ini_entries[] = {
 #define PHP_INI_END()		{ 0, 0, NULL, 0, NULL, NULL, NULL, NULL, NULL, 0, NULL, 0, 0, NULL } };