httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r758891 - in /httpd/httpd/trunk: ./ docs/manual/misc/ include/ modules/examples/ modules/mappers/ modules/proxy/ os/ os/beos/ server/
Date Thu, 26 Mar 2009 22:23:45 GMT
Author: trawick
Date: Thu Mar 26 22:23:44 2009
New Revision: 758891

URL: http://svn.apache.org/viewvc?rev=758891&view=rev
Log:
remove BeOS OS support

Removed:
    httpd/httpd/trunk/os/beos/
Modified:
    httpd/httpd/trunk/LAYOUT
    httpd/httpd/trunk/config.layout
    httpd/httpd/trunk/configure.in
    httpd/httpd/trunk/docs/manual/misc/password_encryptions.xml
    httpd/httpd/trunk/include/httpd.h
    httpd/httpd/trunk/modules/examples/mod_example_ipc.c
    httpd/httpd/trunk/modules/mappers/mod_userdir.c
    httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c
    httpd/httpd/trunk/modules/proxy/proxy_util.c
    httpd/httpd/trunk/os/config.m4
    httpd/httpd/trunk/server/mpm_common.c
    httpd/httpd/trunk/server/mpm_unix.c
    httpd/httpd/trunk/server/util_script.c

Modified: httpd/httpd/trunk/LAYOUT
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/LAYOUT?rev=758891&r1=758890&r2=758891&view=diff
==============================================================================
--- httpd/httpd/trunk/LAYOUT (original)
+++ httpd/httpd/trunk/LAYOUT Thu Mar 26 22:23:44 2009
@@ -139,8 +139,6 @@
 
 os/ ..................... 
 
-  beos/ ................... 
-
   bs2000/ ................. 
 
   netware/ ................ 

Modified: httpd/httpd/trunk/config.layout
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/config.layout?rev=758891&r1=758890&r2=758891&view=diff
==============================================================================
--- httpd/httpd/trunk/config.layout (original)
+++ httpd/httpd/trunk/config.layout Thu Mar 26 22:23:44 2009
@@ -154,30 +154,6 @@
     proxycachedir: ${localstatedir}/proxy
 </Layout>
 
-#  BeOS layout...
-<Layout beos>
-    prefix:        /boot/home/apache
-    exec_prefix:   ${prefix}
-    bindir:        ${exec_prefix}/bin
-    sbindir:       ${exec_prefix}/bin
-    libdir:        ${exec_prefix}/lib
-    libexecdir:    ${exec_prefix}/libexec
-    mandir:        ${prefix}/man
-    sysconfdir:    ${prefix}/conf
-    datadir:       ${prefix}
-    installbuilddir: ${datadir}/build
-    errordir:      ${datadir}/error
-    iconsdir:      ${datadir}/icons
-    htdocsdir:     ${datadir}/htdocs
-    manualdir:     ${datadir}/manual
-    cgidir:        ${datadir}/cgi-bin
-    includedir:    ${prefix}/include
-    localstatedir: ${prefix}
-    runtimedir:    ${localstatedir}/logs
-    logfiledir:    ${localstatedir}/logs
-    proxycachedir: ${localstatedir}/proxy
-</Layout>
-
 #   SuSE 6.x layout
 <Layout SuSE>
     prefix:        /usr

Modified: httpd/httpd/trunk/configure.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/configure.in?rev=758891&r1=758890&r2=758891&view=diff
==============================================================================
--- httpd/httpd/trunk/configure.in (original)
+++ httpd/httpd/trunk/configure.in Thu Mar 26 22:23:44 2009
@@ -273,9 +273,6 @@
       APR_SETVAR(APACHE_MPM, [prefork])
       APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1])
       ;;
-  *-beos*)
-      APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1])
-      ;;
   *os2-emx*)
       APR_SETVAR(APACHE_MPM, [mpmt_os2])
       APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1])
@@ -591,11 +588,6 @@
       APR_ADDTO(SH_LDFLAGS, [\$(EXTRA_LDFLAGS) \$(EXTRA_LIBS)])
       APR_ADDTO(UTIL_LDFLAGS, [-Wl,-uXML_Parse])
       ;;
-    *beos)
-      SH_LDFLAGS='$(top_builddir)/_APP_'
-      PRE_SHARED_CMDS='ln -s $(top_builddir)/httpd $(top_builddir)/_APP_'
-      POST_SHARED_CMDS='rm $(top_builddir)/_APP_'
-      ;;
     *os390)
       APR_ADDTO(HTTPD_LDFLAGS, [--main=$abs_srcdir/server/main.o --core-dll=$abs_srcdir/apachecore.dll])
       APR_ADDTO(SH_LDFLAGS, [--core-dll=$abs_srcdir/apachecore.dll])

Modified: httpd/httpd/trunk/docs/manual/misc/password_encryptions.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/misc/password_encryptions.xml?rev=758891&r1=758890&r2=758891&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/misc/password_encryptions.xml (original)
+++ httpd/httpd/trunk/docs/manual/misc/password_encryptions.xml Thu Mar 26 22:23:44 2009
@@ -37,7 +37,7 @@
     
     <dl>
       <dt>PLAIN TEXT (i.e. <em>unencrypted</em>)</dt>
-      <dd>Windows, BEOS, &amp; Netware only.</dd>
+      <dd>Windows &amp; Netware only.</dd>
        
        <dt>CRYPT</dt>
        <dd>Unix only. Uses the traditional Unix <code>crypt(3)</code> function

Modified: httpd/httpd/trunk/include/httpd.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/httpd.h?rev=758891&r1=758890&r2=758891&view=diff
==============================================================================
--- httpd/httpd/trunk/include/httpd.h (original)
+++ httpd/httpd/trunk/include/httpd.h Thu Mar 26 22:23:44 2009
@@ -81,9 +81,6 @@
 #elif defined(WIN32)
 /** Set default for Windows file system */
 #define HTTPD_ROOT "/apache"
-#elif defined (BEOS)
-/** Set the default for BeOS */
-#define HTTPD_ROOT "/boot/home/apache"
 #elif defined (NETWARE)
 /** Set the default for NetWare */
 #define HTTPD_ROOT "/apache"

Modified: httpd/httpd/trunk/modules/examples/mod_example_ipc.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/examples/mod_example_ipc.c?rev=758891&r1=758890&r2=758891&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/examples/mod_example_ipc.c (original)
+++ httpd/httpd/trunk/modules/examples/mod_example_ipc.c Thu Mar 26 22:23:44 2009
@@ -54,7 +54,7 @@
 #include "http_protocol.h"
 #include "ap_config.h"
 
-#if !defined(OS2) && !defined(WIN32) && !defined(BEOS) && !defined(NETWARE)
+#if !defined(OS2) && !defined(WIN32) && !defined(NETWARE)
 #include "unixd.h"
 #define MOD_EXIPC_SET_MUTEX_PERMS /* XXX Apache should define something */
 #endif

Modified: httpd/httpd/trunk/modules/mappers/mod_userdir.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_userdir.c?rev=758891&r1=758890&r2=758891&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_userdir.c (original)
+++ httpd/httpd/trunk/modules/mappers/mod_userdir.c Thu Mar 26 22:23:44 2009
@@ -64,7 +64,7 @@
 #include "http_config.h"
 #include "http_request.h"
 
-#if !defined(WIN32) && !defined(OS2) && !defined(BEOS) && !defined(NETWARE)
+#if !defined(WIN32) && !defined(OS2) && !defined(NETWARE)
 #define HAVE_UNIX_SUEXEC
 #endif
 

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c?rev=758891&r1=758890&r2=758891&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c Thu Mar 26 22:23:44 2009
@@ -1323,7 +1323,7 @@
                     return HTTP_INTERNAL_SERVER_ERROR;
                 }
 
-#if !defined (TPF) && !defined(BEOS)
+#if !defined (TPF)
                 if (conf->recv_buffer_size > 0
                         && (rv = apr_socket_opt_set(data_sock, APR_SO_RCVBUF,
                                                     conf->recv_buffer_size))) {
@@ -1417,7 +1417,7 @@
                     return HTTP_INTERNAL_SERVER_ERROR;
                 }
 
-#if !defined (TPF) && !defined(BEOS)
+#if !defined (TPF)
                 if (conf->recv_buffer_size > 0
                         && (rv = apr_socket_opt_set(data_sock, APR_SO_RCVBUF,
                                                     conf->recv_buffer_size))) {

Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=758891&r1=758890&r2=758891&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Thu Mar 26 22:23:44 2009
@@ -1578,7 +1578,7 @@
             continue;
         }
 
-#if !defined(TPF) && !defined(BEOS)
+#if !defined(TPF)
         if (conf->recv_buffer_size > 0 &&
             (rv = apr_socket_opt_set(*newsock, APR_SO_RCVBUF,
                                      conf->recv_buffer_size))) {
@@ -2262,7 +2262,7 @@
         }
         conn->connection = NULL;
 
-#if !defined(TPF) && !defined(BEOS)
+#if !defined(TPF)
         if (worker->recv_buffer_size > 0 &&
             (rv = apr_socket_opt_set(newsock, APR_SO_RCVBUF,
                                      worker->recv_buffer_size))) {

Modified: httpd/httpd/trunk/os/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/config.m4?rev=758891&r1=758890&r2=758891&view=diff
==============================================================================
--- httpd/httpd/trunk/os/config.m4 (original)
+++ httpd/httpd/trunk/os/config.m4 Thu Mar 26 22:23:44 2009
@@ -1,10 +1,6 @@
 AC_MSG_CHECKING(for target platform)
 
 case $host in
-*beos*)
-  OS="beos"
-  OS_DIR=$OS
-  ;;
 *pc-os2-emx*)
   OS="os2"
   OS_DIR=$OS

Modified: httpd/httpd/trunk/server/mpm_common.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm_common.c?rev=758891&r1=758890&r2=758891&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm_common.c (original)
+++ httpd/httpd/trunk/server/mpm_common.c Thu Mar 26 22:23:44 2009
@@ -198,8 +198,8 @@
 #ifndef HAVE_INITGROUPS
 int initgroups(const char *name, gid_t basegid)
 {
-#if defined(QNX) || defined(MPE) || defined(BEOS) || defined(_OSD_POSIX) || defined(TPF)
|| defined(__TANDEM) || defined(OS2) || defined(WIN32) || defined(NETWARE)
-/* QNX, MPE and BeOS do not appear to support supplementary groups. */
+#if defined(QNX) || defined(MPE) || defined(_OSD_POSIX) || defined(TPF) || defined(__TANDEM)
|| defined(OS2) || defined(WIN32) || defined(NETWARE)
+/* QNX and MPE do not appear to support supplementary groups. */
     return 0;
 #else /* ndef QNX */
     gid_t groups[NGROUPS_MAX];

Modified: httpd/httpd/trunk/server/mpm_unix.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm_unix.c?rev=758891&r1=758890&r2=758891&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm_unix.c (original)
+++ httpd/httpd/trunk/server/mpm_unix.c Thu Mar 26 22:23:44 2009
@@ -141,17 +141,7 @@
                      " still did not exit, "
                      "sending a SIGKILL",
                      pid);
-#ifndef BEOS
         kill(pid, SIGKILL);
-#else
-        /* sending a SIGKILL kills the entire team on BeOS, and as
-         * httpd thread is part of that team it removes any chance
-         * of ever doing a restart.  To counter this I'm changing to
-         * use a kinder, gentler way of killing a specific thread
-         * that is just as effective.
-         */
-        kill_thread(pid);
-#endif
         break;
 
     case GIVEUP:

Modified: httpd/httpd/trunk/server/util_script.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_script.c?rev=758891&r1=758890&r2=758891&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_script.c (original)
+++ httpd/httpd/trunk/server/util_script.c Thu Mar 26 22:23:44 2009
@@ -122,7 +122,7 @@
     conn_rec *c = r->connection;
     const char *rem_logname;
     char *env_path;
-#if defined(WIN32) || defined(OS2) || defined(BEOS)
+#if defined(WIN32) || defined(OS2)
     char *env_temp;
 #endif
     const char *host;
@@ -215,12 +215,6 @@
     }
 #endif
 
-#ifdef BEOS
-    if ((env_temp = getenv("LIBRARY_PATH")) != NULL) {
-        apr_table_addn(e, "LIBRARY_PATH", env_temp);
-    }
-#endif
-
     apr_table_addn(e, "SERVER_SIGNATURE", ap_psignature("", r));
     apr_table_addn(e, "SERVER_SOFTWARE", ap_get_server_banner());
     apr_table_addn(e, "SERVER_NAME",



Mime
View raw message