diff options
| author | Ryan Bloom <rbb@apache.org> | 2001-11-13 21:15:10 +0100 |
|---|---|---|
| committer | Ryan Bloom <rbb@apache.org> | 2001-11-13 21:15:10 +0100 |
| commit | ccb09e13da01852bb9354a5d0265b53659899e9d (patch) | |
| tree | fb1d3c83825e418ede438cbe979af1917e99ca4c /server/mpm/prefork | |
| parent | Remove ap_new_connection from the header. I missed this when I removed (diff) | |
| download | apache2-ccb09e13da01852bb9354a5d0265b53659899e9d.tar.xz apache2-ccb09e13da01852bb9354a5d0265b53659899e9d.zip | |
don't use a variable named stat, it can cause problems on some platforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91912 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/mpm/prefork')
| -rw-r--r-- | server/mpm/prefork/prefork.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c index 913c61f025..1286d1f339 100644 --- a/server/mpm/prefork/prefork.c +++ b/server/mpm/prefork/prefork.c @@ -543,7 +543,7 @@ static void child_main(int child_num_arg) { apr_pool_t *ptrans; conn_rec *current_conn; - apr_status_t stat = APR_EINIT; + apr_status_t status = APR_EINIT; int sockdes, i; ap_listen_rec *lr; int curr_pollfd, last_pollfd = 0; @@ -658,12 +658,12 @@ static void child_main(int child_num_arg) */ for (;;) { ap_sync_scoreboard_image(); - stat = apr_accept(&csd, sd, ptrans); - if (stat == APR_SUCCESS || !APR_STATUS_IS_EINTR(stat)) + status = apr_accept(&csd, sd, ptrans); + if (status == APR_SUCCESS || !APR_STATUS_IS_EINTR(status)) break; } - if (stat == APR_SUCCESS) + if (status == APR_SUCCESS) break; /* We have a socket ready for reading */ else { /* Our old behaviour here was to continue after accept() @@ -676,7 +676,7 @@ static void child_main(int child_num_arg) * lead to never-ending loops here. So it seems best * to just exit in most cases. */ - switch (stat) { + switch (status) { #ifdef EPROTO /* EPROTO on certain older kernels really means * ECONNABORTED, so we need to ignore it for them. @@ -733,24 +733,24 @@ static void child_main(int child_num_arg) * Ben Hyde noted that temporary ENETDOWN situations * occur in mobile IP. */ - ap_log_error(APLOG_MARK, APLOG_EMERG, stat, ap_server_conf, + ap_log_error(APLOG_MARK, APLOG_EMERG, status, ap_server_conf, "apr_accept: giving up."); clean_child_exit(APEXIT_CHILDFATAL); #endif /*ENETDOWN*/ #ifdef TPF case EINACT: - ap_log_error(APLOG_MARK, APLOG_EMERG, stat, ap_server_conf, + ap_log_error(APLOG_MARK, APLOG_EMERG, status, ap_server_conf, "offload device inactive"); clean_child_exit(APEXIT_CHILDFATAL); break; default: ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, ap_server_conf, - "select/accept error (%d)", stat); + "select/accept error (%d)", status); clean_child_exit(APEXIT_CHILDFATAL); #else default: - ap_log_error(APLOG_MARK, APLOG_ERR, stat, ap_server_conf, + ap_log_error(APLOG_MARK, APLOG_ERR, status, ap_server_conf, "apr_accept: (client socket)"); clean_child_exit(1); #endif |