back-port this from 2.1-dev:

  Unix MPMs: Stop dropping connections when the file descriptor
  is at least FD_SETSIZE.

Submitted by:	trawick
Reviewed by:	nd, jorton

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@103777 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 107f1df503743cef78908edf7869066c6eca2b7b..0824c7aa16220e97aa77e149650f303953cfcac5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.50
 
+  *) Unix MPMs: Stop dropping connections when the file descriptor
+     is at least FD_SETSIZE.  [Jeff Trawick]
+
   *) Fix handling of IPv6 numeric strings in mod_proxy.  [Jeff Trawick]
 
   *) mod_isapi: send_response_header() failed to copy status string's 

diff --git a/STATUS b/STATUS
index 6b39e930b0e68ef122c58486daaef574b9db3de8..e9d5a22ae9255903584707947b5c9a9763cb6959 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/05/26 12:13:58 $]
+Last modified at [$Date: 2004/05/26 12:22:15 $]
 
 Release:
 
@@ -393,15 +393,6 @@ PATCHES TO BACKPORT FROM 2.1
           which implements this, keeping UseCanonicalName Off
           "as is". 
 
-    * Unix MPMs: Stop dropping connections when the file descriptor
-      is at least FD_SETSIZE
-        os/unix/unixd.c: r1.63
-        server/mpm/experimental/leader/leader.c: r1.37
-        server/mpm/experimental/perchild/perchild.c: r1.143
-        server/mpm/experimental/threadpool/threadpool.c: r1.25
-        server/mpm/worker/worker.c: r1.145
-      +1: trawick, nd, jorton
-
     * ThreadStackSize for Win32 and threaded MPMs
       (if there is sufficient interest I'll pursue getting APR 0.9
       fixed up as well as putting together a patch for httpd 2.0.next

diff --git a/os/unix/unixd.c b/os/unix/unixd.c
index a7d73711edc79261ec2b010664b6fb1df5d5466e..18589ecfc28f46023a257b5be315f173bd8b46c4 100644 (file)
--- a/os/unix/unixd.c
+++ b/os/unix/unixd.c
@@ -465,15 +465,6 @@ AP_DECLARE(apr_status_t) unixd_accept(void **accepted, ap_listen_rec *lr,
     if (status == APR_SUCCESS) { 
         *accepted = csd;
         apr_os_sock_get(&sockdes, csd);
-        if (sockdes >= FD_SETSIZE) {
-            ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL,
-                         "new file descriptor %d is too large; you probably need "
-                         "to rebuild Apache with a larger FD_SETSIZE "
-                         "(currently %d)",
-                         sockdes, FD_SETSIZE);
-            apr_socket_close(csd);
-            return APR_EINTR;
-        } 
 #ifdef TPF
         if (sockdes == 0) {                  /* 0 is invalid socket for TPF */
             return APR_EINTR;

diff --git a/server/mpm/experimental/leader/leader.c b/server/mpm/experimental/leader/leader.c
index 6142b326385d8603dbe5f63dec38923ea0e6869c..92aeff25b0f957d15e42ba6bfbe6c8ff1005bcdf 100644 (file)
--- a/server/mpm/experimental/leader/leader.c
+++ b/server/mpm/experimental/leader/leader.c
@@ -601,16 +601,6 @@ static void process_socket(apr_pool_t *p, apr_socket_t *sock, int my_child_num,
     ap_create_sb_handle(&sbh, p, my_child_num, my_thread_num);
     apr_os_sock_get(&csd, sock);
 
-    if (csd >= FD_SETSIZE) {
-        ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL,
-                     "new file descriptor %d is too large; you probably need "
-                     "to rebuild Apache with a larger FD_SETSIZE "
-                     "(currently %d)", 
-                     csd, FD_SETSIZE);
-        apr_socket_close(sock);
-        return;
-    }
-
     current_conn = ap_run_create_connection(p, ap_server_conf, sock,
                                             conn_id, sbh, bucket_alloc);
     if (current_conn) {

diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c
index d068152f91bac6ccfde867cfec412a953782028f..9448dbe485fcb69ac3613ddaefd04c9fd9a20d88 100644 (file)
--- a/server/mpm/experimental/perchild/perchild.c
+++ b/server/mpm/experimental/perchild/perchild.c
@@ -460,16 +460,6 @@ static void process_socket(apr_pool_t *p, apr_socket_t *sock, long conn_id,
         ap_log_error(APLOG_MARK, APLOG_ERR, rv, NULL, "apr_os_sock_get");
     }
 
-    if (csd >= FD_SETSIZE) {
-        ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL,
-                     "new file descriptor %d is too large; you probably need "
-                     "to rebuild Apache with a larger FD_SETSIZE "
-                     "(currently %d)", 
-                     csd, FD_SETSIZE);
-        apr_socket_close(sock);
-        return;
-    }
-
     if (thread_socket_table[thread_num] < 0) {
         ap_sock_disable_nagle(sock);
     }

diff --git a/server/mpm/experimental/threadpool/threadpool.c b/server/mpm/experimental/threadpool/threadpool.c
index a0df66ceeac20b866647352e8f57b3a1fe4c62a2..19c20bab50bba6f188c44da510257b4dde51075b 100644 (file)
--- a/server/mpm/experimental/threadpool/threadpool.c
+++ b/server/mpm/experimental/threadpool/threadpool.c
@@ -675,16 +675,6 @@ static void process_socket(apr_pool_t *p, apr_socket_t *sock, int my_child_num,
     ap_create_sb_handle(&sbh, p, my_child_num, my_thread_num);
     apr_os_sock_get(&csd, sock);
 
-    if (csd >= FD_SETSIZE) {
-        ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL,
-                     "new file descriptor %d is too large; you probably need "
-                     "to rebuild Apache with a larger FD_SETSIZE "
-                     "(currently %d)", 
-                     csd, FD_SETSIZE);
-        apr_socket_close(sock);
-        return;
-    }
-
     current_conn = ap_run_create_connection(p, ap_server_conf, sock,
                                             conn_id, sbh, bucket_alloc);
     if (current_conn) {

diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index d9e463c4fa3e32769e007195d07e8819b02c19ae..619d4de51fa8810556042068918c8a9e9c6b0c5f 100644 (file)
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -514,16 +514,6 @@ static void process_socket(apr_pool_t *p, apr_socket_t *sock, int my_child_num,
     ap_create_sb_handle(&sbh, p, my_child_num, my_thread_num);
     apr_os_sock_get(&csd, sock);
 
-    if (csd >= FD_SETSIZE) {
-        ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL,
-                     "new file descriptor %d is too large; you probably need "
-                     "to rebuild Apache with a larger FD_SETSIZE "
-                     "(currently %d)", 
-                     csd, FD_SETSIZE);
-        apr_socket_close(sock);
-        return;
-    }
-
     current_conn = ap_run_create_connection(p, ap_server_conf, sock,
                                             conn_id, sbh, bucket_alloc);
     if (current_conn) {