pajoye          Wed Mar  5 20:58:08 2008 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src    NEWS 
    /php-src/main       main.c 
  Log:
  - #42505, new sendmail default path breaks on Novell (Guenter Knauf)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1107&r2=1.2027.2.547.2.1108&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1107 php-src/NEWS:1.2027.2.547.2.1108
--- php-src/NEWS:1.2027.2.547.2.1107    Wed Mar  5 10:46:46 2008
+++ php-src/NEWS        Wed Mar  5 20:58:08 2008
@@ -8,6 +8,8 @@
 - Fixed bug #44306 (Better detection of MIPS processors on Windows). (Ilia)
 - Fixed bug #44166 (Parameter handling flaw in PDO::getAvailableDrivers()).
   (Ilia)
+- Fixed bug #42505 (new sendmail default breaks on Netware platform) 
+  (Guenter Knauf)
 
 27 Feb 2008, PHP 5.2.6RC1
 - Fixed security issue detailed in CVE-2008-0599. (Rasmus)
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.61&r2=1.640.2.23.2.62&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.61 php-src/main/main.c:1.640.2.23.2.62
--- php-src/main/main.c:1.640.2.23.2.61 Mon Dec 31 07:20:15 2007
+++ php-src/main/main.c Wed Mar  5 20:58:08 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: main.c,v 1.640.2.23.2.61 2007/12/31 07:20:15 sebastian Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.62 2008/03/05 20:58:08 pajoye Exp $ */
 
 /* {{{ includes
  */
@@ -352,9 +352,8 @@
 #      define PHP_SAFE_MODE_EXEC_DIR ""
 #endif
 
-#if defined(PHP_PROG_SENDMAIL) && !defined(NETWARE)
-#      define DEFAULT_SENDMAIL_PATH PHP_PROG_SENDMAIL " -t -i "
-#elif defined(PHP_WIN32)
+/* Windows and Netware use the internal mail */
+#if defined(PHP_WIN32) || defined(NETWARE)
 #      define DEFAULT_SENDMAIL_PATH NULL
 #else
 #      define DEFAULT_SENDMAIL_PATH "/usr/sbin/sendmail -t -i" 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to