From: Jeff Trawick Date: Fri, 27 Mar 2009 00:32:22 +0000 (+0000) Subject: axe unmaintained 1.3-era code to support AUX, SunOS, IRIX, Next, Tandem, MPE, X-Git-Tag: 2.3.3~789 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=301f0404f577bece6d92f3e700504230237bcb1a;p=apache axe unmaintained 1.3-era code to support AUX, SunOS, IRIX, Next, Tandem, MPE, LynxOS, QNX, and UnixWare git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758944 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/misc/perf-tuning.xml b/docs/manual/misc/perf-tuning.xml index 5996eea17f..52895557c9 100644 --- a/docs/manual/misc/perf-tuning.xml +++ b/docs/manual/misc/perf-tuning.xml @@ -736,10 +736,7 @@ semaphore API allows for a denial of service attack by any CGIs running under the same uid as the webserver (i.e., all CGIs, unless you use something like - suexec or cgiwrapper). For these - reasons this method is not used on any architecture except - IRIX (where the previous two are prohibitively expensive - on most IRIX boxes).

+ suexec or cgiwrapper).

AcceptMutex pthread
diff --git a/docs/manual/programs/htdbm.xml b/docs/manual/programs/htdbm.xml index 0911b16a99..5cc2c313de 100644 --- a/docs/manual/programs/htdbm.xml +++ b/docs/manual/programs/htdbm.xml @@ -260,7 +260,7 @@
Restrictions -

On the Windows and MPE platforms, passwords encrypted with +

On the Windows platform, passwords encrypted with htdbm are limited to no more than 255 characters in length. Longer passwords will be truncated to 255 characters.

diff --git a/docs/manual/programs/htpasswd.xml b/docs/manual/programs/htpasswd.xml index f342408d38..86bffcf968 100644 --- a/docs/manual/programs/htpasswd.xml +++ b/docs/manual/programs/htpasswd.xml @@ -205,7 +205,7 @@ distribution.
Restrictions -

On the Windows and MPE platforms, passwords encrypted with +

On the Windows platform, passwords encrypted with htpasswd are limited to no more than 255 characters in length. Longer passwords will be truncated to 255 characters.

diff --git a/include/ap_config.h b/include/ap_config.h index f1cc3cac10..45056372c2 100644 --- a/include/ap_config.h +++ b/include/ap_config.h @@ -250,15 +250,6 @@ #include "apache_noprobes.h" #endif -/* TODO - We need to put OS detection back to make all the following work */ - -#if defined(SUNOS4) || defined(IRIX) || defined(NEXT) || defined(AUX3) \ - || defined (UW) || defined(LYNXOS) -/* These systems don't do well with any lingering close code; I don't know - * why -- manoj */ -#define NO_LINGCLOSE -#endif - /* If APR has OTHER_CHILD logic, use reliable piped logs. */ #if APR_HAS_OTHER_CHILD #define AP_HAVE_RELIABLE_PIPED_LOGS TRUE diff --git a/include/mpm_common.h b/include/mpm_common.h index aa67151261..d2d68bde7a 100644 --- a/include/mpm_common.h +++ b/include/mpm_common.h @@ -160,7 +160,7 @@ void ap_wait_or_timeout(apr_exit_why_e *status, int *exitcode, apr_proc_t *ret, */ int ap_process_child_status(apr_proc_t *pid, apr_exit_why_e why, int status); -#if defined(TCP_NODELAY) && !defined(MPE) +#if defined(TCP_NODELAY) /** * Turn off the nagle algorithm for the specified socket. The nagle algorithm * says that we should delay sending partial packets in the hopes of getting diff --git a/modules/arch/unix/mod_unixd.c b/modules/arch/unix/mod_unixd.c index 2e3c7a44ca..08446b01ee 100644 --- a/modules/arch/unix/mod_unixd.c +++ b/modules/arch/unix/mod_unixd.c @@ -170,21 +170,6 @@ unixd_drop_privileges(apr_pool_t *pool, server_rec *s) } } -#ifdef MPE - /* Only try to switch if we're running as MANAGER.SYS */ - if (geteuid() == 1 && ap_unixd_config.user_id > 1) { - GETPRIVMODE(); - if (setuid(ap_unixd_config.user_id) == -1) { - GETUSERMODE(); - rv = errno; - ap_log_error(APLOG_MARK, APLOG_ALERT, errno, NULL, - "setuid: unable to change to uid: %ld", - (long) ap_unixd_config.user_id); - return rv; - } - GETUSERMODE(); - } -#else /* Only try to switch if we're running as root */ if (!geteuid() && ( #ifdef _OSD_POSIX @@ -208,7 +193,6 @@ unixd_drop_privileges(apr_pool_t *pool, server_rec *s) return rv; } } -#endif #endif return OK; @@ -326,20 +310,6 @@ AP_DECLARE(int) ap_unixd_setup_child(void) } } -#ifdef MPE - /* Only try to switch if we're running as MANAGER.SYS */ - if (geteuid() == 1 && ap_unixd_config.user_id > 1) { - GETPRIVMODE(); - if (setuid(ap_unixd_config.user_id) == -1) { - GETUSERMODE(); - ap_log_error(APLOG_MARK, APLOG_ALERT, errno, NULL, - "setuid: unable to change to uid: %ld", - (long) ap_unixd_config.user_id); - exit(1); - } - GETUSERMODE(); - } -#else /* Only try to switch if we're running as root */ if (!geteuid() && ( #ifdef _OSD_POSIX @@ -360,7 +330,6 @@ AP_DECLARE(int) ap_unixd_setup_child(void) " after software errors"); } } -#endif #endif return 0; } diff --git a/modules/generators/mod_status.c b/modules/generators/mod_status.c index 6e19da7cc4..701eba1a09 100644 --- a/modules/generators/mod_status.c +++ b/modules/generators/mod_status.c @@ -72,18 +72,6 @@ #include "apr_want.h" #include "apr_strings.h" -#ifdef NEXT -#if (NX_CURRENT_COMPILER_RELEASE == 410) -#ifdef m68k -#define HZ 64 -#else -#define HZ 100 -#endif -#else -#include -#endif -#endif /* NEXT */ - #define STATUS_MAXLINE 64 #define KBYTE 1024 diff --git a/modules/mappers/mod_imagemap.c b/modules/mappers/mod_imagemap.c index f6741d35b4..5a434f722c 100644 --- a/modules/mappers/mod_imagemap.c +++ b/modules/mappers/mod_imagemap.c @@ -79,10 +79,6 @@ #define IMAP_DEFAULT_DEFAULT "nocontent" #define IMAP_BASE_DEFAULT "map" -#ifdef SUNOS4 -double strtod(); /* SunOS needed this */ -#endif - module AP_MODULE_DECLARE_DATA imagemap_module; typedef struct { diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c index 0cbacbf7a0..14ecafbe0f 100644 --- a/server/mpm/prefork/prefork.c +++ b/server/mpm/prefork/prefork.c @@ -47,9 +47,6 @@ #include "ap_mmn.h" #include "apr_poll.h" -#ifdef HAVE_BSTRING_H -#include /* for IRIX, FD_SET calls bzero() */ -#endif #ifdef HAVE_TIME_H #include #endif @@ -1455,10 +1452,6 @@ static void prefork_hooks(apr_pool_t *p) */ static const char *const aszSucc[] = {"core.c", NULL}; -#ifdef AUX3 - (void) set42sig(); -#endif - ap_hook_open_logs(prefork_open_logs, NULL, aszSucc, APR_HOOK_REALLY_FIRST); /* we need to set the MPM state before other pre-config hooks use MPM query * to retrieve it, so register as REALLY_FIRST diff --git a/server/mpm_common.c b/server/mpm_common.c index b46281479f..2d365434b8 100644 --- a/server/mpm_common.c +++ b/server/mpm_common.c @@ -138,7 +138,7 @@ void ap_wait_or_timeout(apr_exit_why_e *status, int *exitcode, apr_proc_t *ret, return; } -#if defined(TCP_NODELAY) && !defined(MPE) +#if defined(TCP_NODELAY) void ap_sock_disable_nagle(apr_socket_t *s) { /* The Nagle algorithm says that we should delay sending partial @@ -198,10 +198,9 @@ AP_DECLARE(gid_t) ap_gname2id(const char *name) #ifndef HAVE_INITGROUPS int initgroups(const char *name, gid_t basegid) { -#if defined(QNX) || defined(MPE) || defined(_OSD_POSIX) || defined(__TANDEM) || defined(WIN32) || defined(NETWARE) -/* QNX and MPE do not appear to support supplementary groups. */ +#if defined(_OSD_POSIX) || defined(WIN32) || defined(NETWARE) return 0; -#else /* ndef QNX */ +#else gid_t groups[NGROUPS_MAX]; struct group *g; int index = 0; @@ -224,7 +223,7 @@ int initgroups(const char *name, gid_t basegid) endgrent(); return setgroups(index, groups); -#endif /* def QNX */ +#endif } #endif /* def NEED_INITGROUPS */ diff --git a/support/suexec.c b/support/suexec.c index 59371be0bb..a6a82b5ec2 100644 --- a/support/suexec.c +++ b/support/suexec.c @@ -55,29 +55,6 @@ #include #endif -/* - *********************************************************************** - * There is no initgroups() in QNX, so I believe this is safe :-) - * Use cc -osuexec -3 -O -mf -DQNX suexec.c to compile. - * - * May 17, 1997. - * Igor N. Kovalenko -- infoh mail.wplus.net - *********************************************************************** - */ - -#if defined(NEED_INITGROUPS) -int initgroups(const char *name, gid_t basegid) -{ - /* QNX and MPE do not appear to support supplementary groups. */ - return 0; -} -#endif - -#if defined(SUNOS4) -extern char *sys_errlist[]; -#define strerror(x) sys_errlist[(x)] -#endif - #if defined(PATH_MAX) #define AP_MAXPATH PATH_MAX #elif defined(MAXPATHLEN)