cvs: php-src /main fopen_wrappers.c main.c
| From: | Anantha Kesari H Y | Date: | Sat, 16 Jul 2005 12:21:35 +0000 |
| Subject: | cvs: php-src /main fopen_wrappers.c main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-32935@lists.php.net to get a copy of this message | ||
hyanantha Sat Jul 16 08:21:35 2005 EDT
Modified files:
/php-src/main fopen_wrappers.c main.c
Log:
main/fopen_wrappers.c
NetWare file names are case insensitive
main/main.c
NetWare has no sendmail binary. It uses the smart host mailing code avaiolable in php distro.
Could not find a better place to put this than main/main.c.
-- Kamesh
http://cvs.php.net/diff.php/php-src/main/fopen_wrappers.c?r1=1.173&r2=1.174&ty=u
Index: php-src/main/fopen_wrappers.c
diff -u php-src/main/fopen_wrappers.c:1.173 php-src/main/fopen_wrappers.c:1.174
--- php-src/main/fopen_wrappers.c:1.173 Wed Feb 23 03:56:47 2005
+++ php-src/main/fopen_wrappers.c Sat Jul 16 08:21:34 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fopen_wrappers.c,v 1.173 2005/02/23 08:56:47 hyanantha Exp $ */
+/* $Id: fopen_wrappers.c,v 1.174 2005/07/16 12:21:34 hyanantha Exp $ */
/* {{{ includes
*/
@@ -123,7 +123,7 @@
}
/* Check the path */
-#ifdef PHP_WIN32
+#if defined(PHP_WIN32) || defined(NETWARE)
if (strncasecmp(resolved_basedir, resolved_name, resolved_basedir_len) == 0) {
#else
if (strncmp(resolved_basedir, resolved_name, resolved_basedir_len) == 0) {
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.636&r2=1.637&ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.636 php-src/main/main.c:1.637
--- php-src/main/main.c:1.636 Tue Jul 12 12:53:29 2005
+++ php-src/main/main.c Sat Jul 16 08:21:34 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.636 2005/07/12 16:53:29 iliaa Exp $ */
+/* $Id: main.c,v 1.637 2005/07/16 12:21:34 hyanantha Exp $ */
/* {{{ includes
*/
@@ -222,7 +222,7 @@
# define PHP_SAFE_MODE_EXEC_DIR ""
#endif
-#ifdef PHP_PROG_SENDMAIL
+#if defined(PHP_PROG_SENDMAIL) && !defined(NETWARE)
# define DEFAULT_SENDMAIL_PATH PHP_PROG_SENDMAIL " -t -i "
#else
# define DEFAULT_SENDMAIL_PATH NULL