diff options
| author | Uwe Schindler <thetaphi@php.net> | 2008-11-29 19:57:49 +0000 |
|---|---|---|
| committer | Uwe Schindler <thetaphi@php.net> | 2008-11-29 19:57:49 +0000 |
| commit | 0bcf89e266b8bd7ca73b279ff89f9e47eebb444c (patch) | |
| tree | d39d1977249e565d9b8d4997a70eae65ba7ba65c | |
| parent | 7db781fc1b3fa7b774b77d691048090a7b2c9827 (diff) | |
| download | php-git-0bcf89e266b8bd7ca73b279ff89f9e47eebb444c.tar.gz | |
MFH: Some nsapi.h specific ifdefs unified & corrected
| -rw-r--r-- | sapi/nsapi/nsapi.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sapi/nsapi/nsapi.c b/sapi/nsapi/nsapi.c index 1e404bdc58..7869942fda 100644 --- a/sapi/nsapi/nsapi.c +++ b/sapi/nsapi/nsapi.c @@ -488,7 +488,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(); } @@ -912,12 +912,10 @@ int NSAPI_PUBLIC php5_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); |