Skip to content

Commit d4fbb3c

Browse files
author
Ilia Alshanetsky
committed
Fixed bug #40127 (apache2handler doesnt compile on Netware).
1 parent c5588fa commit d4fbb3c

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

NEWS

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ PHP NEWS
44
- Added CURLOPT_TCP_NODELAY constant to Curl extension. (Sara)
55
- Improved proc_open(). Now on Windows it can run external commands not through
66
CMD.EXE. (Dmitry)
7+
- Fixed bug #40127 (apache2handler doesnt compile on Netware). (gk at gknw
8+
dot de)
79
- Fixed bug #40121 (PDO_DBLIB driver wont free statements). (Ilia)
810
- Fixed bug #40098 (php_fopen_primary_script() not thread safe). (Ilia)
911
- Fixed bug #40091 (spl_autoload_register with 2 instances of the same

sapi/apache2handler/php_functions.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
#include "util_script.h"
4343
#include "http_core.h"
4444
#include "ap_mpm.h"
45-
#if !defined(WIN32) && !defined(WINNT)
45+
#if !defined(WIN32) && !defined(WINNT) && !defined(NETWARE)
4646
#include "unixd.h"
4747
#endif
4848

@@ -382,7 +382,7 @@ PHP_MINFO_FUNCTION(apache)
382382
int n, max_requests;
383383
char *p;
384384
server_rec *serv = ((php_struct *) SG(server_context))->r->server;
385-
#if !defined(WIN32) && !defined(WINNT)
385+
#if !defined(WIN32) && !defined(WINNT) && !defined(NETWARE)
386386
AP_DECLARE_DATA extern unixd_config_rec unixd_config;
387387
#endif
388388

@@ -413,7 +413,7 @@ PHP_MINFO_FUNCTION(apache)
413413
sprintf(tmp, "%s:%u", serv->server_hostname, serv->port);
414414
php_info_print_table_row(2, "Hostname:Port", tmp);
415415

416-
#if !defined(WIN32) && !defined(WINNT)
416+
#if !defined(WIN32) && !defined(WINNT) && !defined(NETWARE)
417417
sprintf(tmp, "%s(%d)/%d", unixd_config.user_name, unixd_config.user_id, unixd_config.group_id);
418418
php_info_print_table_row(2, "User/Group", tmp);
419419
#endif

0 commit comments

Comments
 (0)