rrichards Sun Oct 9 22:26:57 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/main main.c
Log:
MFH: PHP_CONFIG_FILE_PATH needs to use strlen() due to Win build
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.640.2.5&r2=1.640.2.6&ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.5 php-src/main/main.c:1.640.2.6
--- php-src/main/main.c:1.640.2.5 Wed Sep 14 16:08:31 2005
+++ php-src/main/main.c Sun Oct 9 22:26:56 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.640.2.5 2005/09/14 20:08:31 derick Exp $ */
+/* $Id: main.c,v 1.640.2.6 2005/10/10 02:26:56 rrichards Exp $ */
/* {{{ includes
*/
@@ -1468,7 +1468,7 @@
REGISTER_MAIN_STRINGL_CONSTANT("PHP_DATADIR", PHP_DATADIR,
sizeof(PHP_DATADIR)-1, CONST_PERSISTENT | CONST_CS);
REGISTER_MAIN_STRINGL_CONSTANT("PHP_SYSCONFDIR", PHP_SYSCONFDIR,
sizeof(PHP_SYSCONFDIR)-1, CONST_PERSISTENT | CONST_CS);
REGISTER_MAIN_STRINGL_CONSTANT("PHP_LOCALSTATEDIR", PHP_LOCALSTATEDIR,
sizeof(PHP_LOCALSTATEDIR)-1, CONST_PERSISTENT | CONST_CS);
- REGISTER_MAIN_STRINGL_CONSTANT("PHP_CONFIG_FILE_PATH",
PHP_CONFIG_FILE_PATH, sizeof(PHP_CONFIG_FILE_PATH)-1, CONST_PERSISTENT |
CONST_CS);
+ REGISTER_MAIN_STRINGL_CONSTANT("PHP_CONFIG_FILE_PATH",
PHP_CONFIG_FILE_PATH, strlen(PHP_CONFIG_FILE_PATH), CONST_PERSISTENT |
CONST_CS);
REGISTER_MAIN_STRINGL_CONSTANT("PHP_CONFIG_FILE_SCAN_DIR",
PHP_CONFIG_FILE_SCAN_DIR, sizeof(PHP_CONFIG_FILE_SCAN_DIR)-1, CONST_PERSISTENT
| CONST_CS);
REGISTER_MAIN_STRINGL_CONSTANT("PHP_SHLIB_SUFFIX", PHP_SHLIB_SUFFIX,
sizeof(PHP_SHLIB_SUFFIX)-1, CONST_PERSISTENT | CONST_CS);
REGISTER_MAIN_STRINGL_CONSTANT("PHP_EOL", PHP_EOL, sizeof(PHP_EOL)-1,
CONST_PERSISTENT | CONST_CS);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
