cvs: /php3 configuration-parser.y
| From: | bjh | Date: | Mon, 23 Aug 1999 14:14:02 +0000 |
| Subject: | cvs: /php3 configuration-parser.y | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-10100@lists.php.net to get a copy of this message | ||
bjh Mon Aug 23 10:14:02 1999 EDT
Modified files:
/php3 configuration-parser.y
Log:
OS/2: Look for php3.ini in the directory specified by the environment
variable "ETC".
Index: php3/configuration-parser.y
diff -u php3/configuration-parser.y:1.77 php3/configuration-parser.y:1.78
--- php3/configuration-parser.y:1.77 Mon Aug 23 04:55:09 1999
+++ php3/configuration-parser.y Mon Aug 23 10:14:02 1999
@@ -30,7 +30,7 @@
-/* $Id: configuration-parser.y,v 1.77 1999/08/23 08:55:09 bjh Exp $ */
+/* $Id: configuration-parser.y,v 1.78 1999/08/23 14:14:02 bjh Exp $ */
#define DEBUG_CFG_PARSER 1
#ifdef THREAD_SAFE
@@ -167,6 +167,16 @@
}
}
}
+#elif OS2
+ if (GLOBAL(php3_ini_path)) {
+ default_location = GLOBAL(php3_ini_path);
+ } else {
+ default_location = getenv("ETC");
+
+ if (!default_location) {
+ default_location = CONFIGURATION_FILE_PATH;
+ }
+ }
#else
if (!GLOBAL(php3_ini_path)) {
default_location = CONFIGURATION_FILE_PATH;