cvs: php4 /sapi/apache mod_php4.c php_apache.c php_apache_http.h

rvenkat Fri May 31 00:47:19 2002 EDT Modified files: /php4/sapi/apache mod_php4.c php_apache.c php_apache_http.h Log: NetWare related changes Index: php4/sapi/apache/mod_php4.c diff -u php4/sapi/apache/mod_php4.c:1.131 php4/sapi/apache/mod_php4.c:1.132 --- php4/sapi/apache/mod_php4.c:1.131 Fri May 10 23:33:29 2002 +++ php4/sapi/apache/mod_php4.c Fri May 31 00:47:15 2002 @@ -17,9 +17,13 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.131 2002/05/11 03:33:29 zeev Exp $ */ +/* $Id: mod_php4.c,v 1.132 2002/05/31 04:47:15 rvenkat Exp $ */ #include "php_apache_http.h" + +#ifdef NETWARE +#define SIGPIPE SIGINT +#endif #if defined(ZEND_MULTIBYTE) && defined(HAVE_MBSTRING) #include "ext/mbstring/mbstring.h" Index: php4/sapi/apache/php_apache.c diff -u php4/sapi/apache/php_apache.c:1.58 php4/sapi/apache/php_apache.c:1.59 --- php4/sapi/apache/php_apache.c:1.58 Tue Apr 23 07:40:19 2002 +++ php4/sapi/apache/php_apache.c Fri May 31 00:47:18 2002 @@ -17,11 +17,11 @@ | David Sklar <sklar@student.net> | +----------------------------------------------------------------------+ */ -/* $Id: php_apache.c,v 1.58 2002/04/23 11:40:19 hholzgra Exp $ */ +/* $Id: php_apache.c,v 1.59 2002/05/31 04:47:18 rvenkat Exp $ */ #include "php_apache_http.h" -#ifdef PHP_WIN32 +#if defined(PHP_WIN32) || defined(NETWARE) #include "zend.h" #include "ap_compat.h" #else @@ -77,8 +77,12 @@ static PHP_MINIT_FUNCTION(apache) { #ifdef ZTS +#ifndef NETWARE ts_allocate_id(&php_apache_info_id, sizeof(php_apache_info_struct), php_apache_globals_ctor, NULL); #else + ts_allocate_id(&php_apache_info_id, sizeof(php_apache_info_struct), (void (*)(void *, void ***))php_apache_globals_ctor, NULL); +#endif +#else php_apache_globals_ctor(&php_apache_info TSRMLS_CC); #endif REGISTER_INI_ENTRIES(); @@ -180,6 +184,10 @@ php_info_print_table_row(1, "Apache for Windows 95/NT"); php_info_print_table_end(); php_info_print_table_start(); +#elif defined(NETWARE) + php_info_print_table_row(1, "Apache for NetWare"); + php_info_print_table_end(); + php_info_print_table_start(); #else php_info_print_table_row(2, "APACHE_INCLUDE", PHP_APACHE_INCLUDE); php_info_print_table_row(2, "APACHE_TARGET", PHP_APACHE_TARGET); @@ -204,6 +212,11 @@ sprintf(output_buf, "Connection: %d - Keep-Alive: %d", serv->timeout, serv->keep_alive_timeout); php_info_print_table_row(2, "Timeouts", output_buf); #if !defined(WIN32) && !defined(WINNT) +/* + This block seems to be working on NetWare; But it seems to be showing + all modules instead of just the loaded ones +*/ + php_info_print_table_row(2, "Server Root", server_root); strcpy(modulenames, ""); Index: php4/sapi/apache/php_apache_http.h diff -u php4/sapi/apache/php_apache_http.h:1.2 php4/sapi/apache/php_apache_http.h:1.3 --- php4/sapi/apache/php_apache_http.h:1.2 Mon Apr 22 23:01:30 2002 +++ php4/sapi/apache/php_apache_http.h Fri May 31 00:47:19 2002 @@ -5,6 +5,10 @@ #include <stddef.h> #endif +#ifdef NETWARE +#include <netinet/in.h> +#endif + #include "zend.h" #include "php_regex.h"