From: Uwe Schindler <thetaphi@php.net>
Date: Sat, 29 Nov 2008 19:57:23 +0000 (+0000)
Subject: Some nsapi.h specific ifdefs unified & corrected
X-Git-Tag: BEFORE_HEAD_NS_CHANGES_MERGE~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a2fd029278e2f9765910894d856616efef93d7d;p=php

Some nsapi.h specific ifdefs unified & corrected
---

diff --git a/sapi/nsapi/nsapi.c b/sapi/nsapi/nsapi.c
index d02cd52e38..e01df66c0b 100644
--- a/sapi/nsapi/nsapi.c
+++ b/sapi/nsapi/nsapi.c
@@ -486,7 +486,7 @@ static void sapi_nsapi_flush(void *server_context)
 	}
 
 	/* flushing is only supported in iPlanet servers from version 6.1 on, make it conditional */
-#if defined(net_flush)
+#if NSAPI_VERSION >= 302
 	if (net_flush(rc->sn->csd) < 0) {
 		php_handle_aborted_connection();
 	}
@@ -908,12 +908,10 @@ int NSAPI_PUBLIC php6_init(pblock *pb, Session *sn, Request *rq)
 	int threads=128; /* default for server */
 
 	/* fetch max threads from NSAPI and initialize TSRM with it */
-#if defined(pool_maxthreads)
-	threads=pool_maxthreads;
+	threads=conf_getglobals()->Vpool_maxthreads;
 	if (threads<1) {
 		threads=128; /* default for server */
 	}
-#endif
 	tsrm_startup(threads, 1, 0, NULL);
 
 	core_globals = ts_resource(core_globals_id);