cvs: /php4/sapi/aolserver aolserver.c

sas Wed Nov 24 12:36:53 1999 EDT Modified files: /php4/sapi/aolserver aolserver.c Log: some cosmetical changes Index: php4/sapi/aolserver/aolserver.c diff -u php4/sapi/aolserver/aolserver.c:1.14 php4/sapi/aolserver/aolserver.c:1.15 --- php4/sapi/aolserver/aolserver.c:1.14 Sun Nov 21 20:30:28 1999 +++ php4/sapi/aolserver/aolserver.c Wed Nov 24 12:36:23 1999 @@ -22,9 +22,9 @@ * - CGI/1.1 conformance */ -/* $Id: aolserver.c,v 1.14 1999/11/22 01:30:28 sas Exp $ */ +/* $Id: aolserver.c,v 1.15 1999/11/24 17:36:23 sas Exp $ */ -/* conflict between PHP and AOLserver */ +/* conflict between PHP and AOLserver headers */ #define Debug php_Debug #include "php.h" #undef Debug @@ -32,7 +32,7 @@ #ifdef HAVE_AOLSERVER #ifndef ZTS -#error AOLserver module only useable in thread-safe mode +#error AOLserver module is only useable in thread-safe mode #endif #define NS_BUF_SIZE 511 @@ -46,6 +46,8 @@ #include "php_version.h" +/* This symbol is used by AOLserver to tell the API version we expect */ + int Ns_ModuleVersion = 1; #define NSLS_D ns_globals_struct *ns_context @@ -74,8 +76,6 @@ size_t data_avail; } ns_globals_struct; -static void php_ns_config(php_ns_context *ctx); - /* * php_ns_sapi_ub_write() writes data to the client connection. */ @@ -139,7 +139,9 @@ if(SG(sapi_headers).send_default_content_type) { Ns_ConnSetRequiredHeaders(NSG(conn), "text/html", 0); } + Ns_ConnFlushHeaders(NSG(conn), SG(sapi_headers).http_response_code); + return SAPI_HEADER_SENT_SUCCESSFULLY; } @@ -194,7 +196,7 @@ int uptime = Ns_InfoUptime(); PUTS("<table border=5 width=600>\n"); - php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.14 1999/11/22 01:30:28 sas Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.15 1999/11/24 17:36:23 sas Exp $"); php_info_print_table_row(2, "Build date", Ns_InfoBuildDate()); php_info_print_table_row(2, "Config file path", Ns_InfoConfigFile()); php_info_print_table_row(2, "Error Log path", Ns_InfoErrorLog()); @@ -264,7 +266,7 @@ static sapi_module_struct sapi_module = { "PHP Language", - php_ns_startup, /* startup */ + php_ns_startup, /* startup */ php_module_shutdown_wrapper, /* shutdown */ php_ns_sapi_ub_write, /* unbuffered write */