cvs: php-src(PHP_5_2) / NEWS /sapi/apache2handler php_functions.c

From: Date: Sun, 14 Jan 2007 16:59:05 +0000
Subject: cvs: php-src(PHP_5_2) / NEWS /sapi/apache2handler php_functions.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-42725@lists.php.net to get a copy of this message
iliaa Sun Jan 14 16:59:05 2007 UTC Modified files: (Branch: PHP_5_2) /php-src NEWS /php-src/sapi/apache2handler php_functions.c Log: Fixed bug #40127 (apache2handler doesnt compile on Netware). http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.495&r2=1.2027.2.547.2.496&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.495 php-src/NEWS:1.2027.2.547.2.496 --- php-src/NEWS:1.2027.2.547.2.495 Sun Jan 14 16:57:50 2007 +++ php-src/NEWS Sun Jan 14 16:59:04 2007 @@ -4,6 +4,8 @@ - Added CURLOPT_TCP_NODELAY constant to Curl extension. (Sara) - Improved proc_open(). Now on Windows it can run external commands not through CMD.EXE. (Dmitry) +- Fixed bug #40127 (apache2handler doesnt compile on Netware). (gk at gknw + dot de) - Fixed bug #40121 (PDO_DBLIB driver wont free statements). (Ilia) - Fixed bug #40098 (php_fopen_primary_script() not thread safe). (Ilia) - Fixed bug #40091 (spl_autoload_register with 2 instances of the same http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/php_functions.c?r1=1.18.2.6.2.2&r2=1.18.2.6.2.3&diff_format=u Index: php-src/sapi/apache2handler/php_functions.c diff -u php-src/sapi/apache2handler/php_functions.c:1.18.2.6.2.2 php-src/sapi/apache2handler/php_functions.c:1.18.2.6.2.3 --- php-src/sapi/apache2handler/php_functions.c:1.18.2.6.2.2 Mon Jan 1 09:36:12 2007 +++ php-src/sapi/apache2handler/php_functions.c Sun Jan 14 16:59:05 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_functions.c,v 1.18.2.6.2.2 2007/01/01 09:36:12 sebastian Exp $ */ +/* $Id: php_functions.c,v 1.18.2.6.2.3 2007/01/14 16:59:05 iliaa Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -42,7 +42,7 @@ #include "util_script.h" #include "http_core.h" #include "ap_mpm.h" -#if !defined(WIN32) && !defined(WINNT) +#if !defined(WIN32) && !defined(WINNT) && !defined(NETWARE) #include "unixd.h" #endif @@ -382,7 +382,7 @@ int n, max_requests; char *p; server_rec *serv = ((php_struct *) SG(server_context))->r->server; -#if !defined(WIN32) && !defined(WINNT) +#if !defined(WIN32) && !defined(WINNT) && !defined(NETWARE) AP_DECLARE_DATA extern unixd_config_rec unixd_config; #endif @@ -413,7 +413,7 @@ sprintf(tmp, "%s:%u", serv->server_hostname, serv->port); php_info_print_table_row(2, "Hostname:Port", tmp); -#if !defined(WIN32) && !defined(WINNT) +#if !defined(WIN32) && !defined(WINNT) && !defined(NETWARE) sprintf(tmp, "%s(%d)/%d", unixd_config.user_name, unixd_config.user_id, unixd_config.group_id); php_info_print_table_row(2, "User/Group", tmp); #endif

« previous php.cvs (#42725) next »