]>
Commit | Line | Data |
---|---|---|
0e467b1f AM |
1 | |
2 | - remove FD_SETSIZE check since the fd is only ever poll()ed not | |
3 | select()ed... prompted by Jeff Trawick. | |
4 | ||
5 | --- httpd-2.0.48/os/unix/unixd.c.fdsetsize | |
6 | +++ httpd-2.0.48/os/unix/unixd.c | |
7 | @@ -501,28 +501,12 @@ | |
8 | { | |
9 | apr_socket_t *csd; | |
10 | apr_status_t status; | |
11 | - int sockdes; | |
12 | ||
13 | *accepted = NULL; | |
14 | status = apr_accept(&csd, lr->sd, ptrans); | |
15 | if (status == APR_SUCCESS) { | |
16 | *accepted = csd; | |
17 | - apr_os_sock_get(&sockdes, csd); | |
18 | - if (sockdes >= FD_SETSIZE) { | |
19 | - ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, | |
20 | - "new file descriptor %d is too large; you probably need " | |
21 | - "to rebuild Apache with a larger FD_SETSIZE " | |
22 | - "(currently %d)", | |
23 | - sockdes, FD_SETSIZE); | |
24 | - apr_socket_close(csd); | |
25 | - return APR_EINTR; | |
26 | - } | |
27 | -#ifdef TPF | |
28 | - if (sockdes == 0) { /* 0 is invalid socket for TPF */ | |
29 | - return APR_EINTR; | |
30 | - } | |
31 | -#endif | |
32 | - return status; | |
33 | + return APR_SUCCESS; | |
34 | } | |
35 | ||
36 | if (APR_STATUS_IS_EINTR(status)) { |