[patch] Delay cgi requests made before the cgid daemon has started

cgid.patch (text/plain), 3.07 KB, created by Edward Lu on 2015-03-16 18:07:02 UTC

(hide)

Description: Delay cgi requests made before the cgid daemon has started

Filename:

MIME Type:

Creator: Edward Lu

Created: 2015-03-16 18:07:02 UTC

Size: 3.07 KB

patch

obsolete

>diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c >index 50cc883..f5e50cf 100644 >--- a/modules/generators/mod_cgid.c >+++ b/modules/generators/mod_cgid.c >@@ -866,6 +866,8 @@ static int cgid_start(apr_pool_t *p, server_rec *main_server, > apr_proc_t *procnew) > { > >+ sleep(3); >+ > daemon_should_exit = 0; /* clear setting from previous generation */ > if ((daemon_pid = fork()) < 0) { > ap_log_error(APLOG_MARK, APLOG_ERR, errno, main_server, APLOGNO(01253) >@@ -1203,18 +1205,26 @@ static int connect_to_daemon(int *sdptr, request_rec *r, > { > int sd; > int connect_tries; >+ int connect_errno; > apr_interval_time_t sliding_timer; > > connect_tries = 0; > sliding_timer = 100000; /* 100 milliseconds */ > while (1) { >+ connect_errno = 0; > ++connect_tries; > if ((sd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { > return log_scripterror(r, conf, HTTP_INTERNAL_SERVER_ERROR, errno, > APLOGNO(01255) "unable to create socket to cgi daemon"); > } > if (connect(sd, (struct sockaddr *)server_addr, server_addr_len) < 0) { >- if (errno == ECONNREFUSED && connect_tries < DEFAULT_CONNECT_ATTEMPTS) { >+ /* Save errno for later */ >+ connect_errno = errno; >+ /* ECONNREFUSED means the listen queue is full; ENOENT means that >+ * the cgid server either hasn't started up yet, or we're pointing >+ * at the wrong socket file */ >+ if ((errno == ECONNREFUSED || errno == ENOENT) >+ && connect_tries < DEFAULT_CONNECT_ATTEMPTS) { > ap_log_rerror(APLOG_MARK, APLOG_DEBUG, errno, r, APLOGNO(01256) > "connect #%d to cgi daemon failed, sleeping before retry", > connect_tries); >@@ -1235,11 +1245,21 @@ static int connect_to_daemon(int *sdptr, request_rec *r, > close_unix_socket, apr_pool_cleanup_null); > break; /* we got connected! */ > } >+ > /* gotta try again, but make sure the cgid daemon is still around */ >- if (kill(daemon_pid, 0) != 0) { >- return log_scripterror(r, conf, HTTP_SERVICE_UNAVAILABLE, errno, APLOGNO(01258) >+ if (connect_errno != ENOENT && kill(daemon_pid, 0) != 0) { >+ return log_scripterror(r, conf, HTTP_SERVICE_UNAVAILABLE, connect_errno, APLOGNO(01258) > "cgid daemon is gone; is Apache terminating?"); > } >+ >+ /* If we didn't find the socket but we started the server long ago, >+ * chances are there's something wrong with the cgid daemon >+ * XXX: Hardcoded number alert */ >+ if (connect_errno == ENOENT && >+ apr_time_sec(apr_time_now() - ap_scoreboard_image->global->restart_time) > 60) { >+ return log_scripterror(r, conf, HTTP_SERVICE_UNAVAILABLE, connect_errno, APLOGNO() >+ "the unix socket file is gone or was never created"); >+ } > } > *sdptr = sd; > return OK; View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]