diff options
| author | Venkat Raghavan S <rvenkat@php.net> | 2002-05-31 04:49:45 +0000 |
|---|---|---|
| committer | Venkat Raghavan S <rvenkat@php.net> | 2002-05-31 04:49:45 +0000 |
| commit | 575e3682f53e6e0146bc1aeed9cf721dbb196b35 (patch) | |
| tree | 906dce8bef2236e7ccf083a5586f92bf4a279650 /sapi/apache | |
| parent | c4fd805ce4dbb1effc2fe8970e5a906a8908990b (diff) | |
| download | php-git-575e3682f53e6e0146bc1aeed9cf721dbb196b35.tar.gz | |
NetWare related changes
Diffstat (limited to 'sapi/apache')
| -rw-r--r-- | sapi/apache/mod_php4.c | 4 | ||||
| -rw-r--r-- | sapi/apache/php_apache.c | 15 | ||||
| -rw-r--r-- | sapi/apache/php_apache_http.h | 4 |
3 files changed, 22 insertions, 1 deletions
diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c index 0faa7b13f4..e3afd228b4 100644 --- a/sapi/apache/mod_php4.c +++ b/sapi/apache/mod_php4.c @@ -21,6 +21,10 @@ #include "php_apache_http.h" +#ifdef NETWARE +#define SIGPIPE SIGINT +#endif + #if defined(ZEND_MULTIBYTE) && defined(HAVE_MBSTRING) #include "ext/mbstring/mbstring.h" #endif /* defined(ZEND_MULTIBYTE) && defined(HAVE_MBSTRING) */ diff --git a/sapi/apache/php_apache.c b/sapi/apache/php_apache.c index b7572922b5..21ca18a177 100644 --- a/sapi/apache/php_apache.c +++ b/sapi/apache/php_apache.c @@ -21,7 +21,7 @@ #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 void php_apache_globals_ctor(php_apache_info_struct *apache_globals TSRML 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_MINFO_FUNCTION(apache) 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 @@ PHP_MINFO_FUNCTION(apache) 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, ""); diff --git a/sapi/apache/php_apache_http.h b/sapi/apache/php_apache_http.h index 6d41f418ab..56590fb822 100644 --- a/sapi/apache/php_apache_http.h +++ b/sapi/apache/php_apache_http.h @@ -5,6 +5,10 @@ #include <stddef.h> #endif +#ifdef NETWARE +#include <netinet/in.h> +#endif + #include "zend.h" #include "php_regex.h" |