archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

MFH: Some nsapi.h specific ifdefs unified & corrected

Browse source
This commit is contained in:
Uwe Schindler 2008-11-29 19:57:49 +00:00
parent 7db781fc1b
commit 0bcf89e266
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sapi/nsapi/nsapi.c
View file

@ -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 */ /* 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) { if (net_flush(rc->sn->csd) < 0) {
php_handle_aborted_connection(); 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 */ int threads=128; /* default for server */
/* fetch max threads from NSAPI and initialize TSRM with it */ /* fetch max threads from NSAPI and initialize TSRM with it */
#if defined(pool_maxthreads) threads=conf_getglobals()->Vpool_maxthreads;
threads=pool_maxthreads;
if (threads<1) { if (threads<1) {
threads=128; /* default for server */ threads=128; /* default for server */
} }
#endif
tsrm_startup(threads, 1, 0, NULL); tsrm_startup(threads, 1, 0, NULL);
core_globals = ts_resource(core_globals_id); core_globals = ts_resource(core_globals_id);