You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2018/01/05 22:04:58 UTC
svn commit: r1820360 [18/18] - in /httpd/httpd/branches/2.4.x-mod_md: ./
docs/ docs/manual/ docs/manual/developer/ docs/manual/faq/
docs/manual/howto/ docs/manual/misc/ docs/manual/mod/ docs/manual/platform/
docs/manual/programs/ docs/manual/rewrite/ d...
Modified: httpd/httpd/branches/2.4.x-mod_md/modules/ssl/ssl_engine_init.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/modules/ssl/ssl_engine_init.c?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/modules/ssl/ssl_engine_init.c (original)
+++ httpd/httpd/branches/2.4.x-mod_md/modules/ssl/ssl_engine_init.c Fri Jan 5 22:04:52 2018
@@ -32,6 +32,22 @@
#include "mpm_common.h"
#include "mod_md.h"
+/* Use the header, once mod_md is backported. break the dependency loop for now. */
+#define MOD_MD_BACKPORTED 0
+#if MOD_MD_BACKPORTED
+#include "mod_md.h"
+#else
+APR_DECLARE_OPTIONAL_FN(int,
+ md_is_managed, (struct server_rec *));
+APR_DECLARE_OPTIONAL_FN(apr_status_t,
+ md_get_certificate, (struct server_rec *, apr_pool_t *,
+ const char **pkeyfile,
+ const char **pcertfile));
+APR_DECLARE_OPTIONAL_FN(int,
+ md_is_challenge, (struct conn_rec *, const char *,
+ X509 **pcert, EVP_PKEY **pkey));
+#endif
+
APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(ssl, SSL, int, init_server,
(server_rec *s,apr_pool_t *p,int is_proxy,SSL_CTX *ctx),
(s,p,is_proxy,ctx), OK, DECLINED)
Modified: httpd/httpd/branches/2.4.x-mod_md/server/config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/server/config.c?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/server/config.c (original)
+++ httpd/httpd/branches/2.4.x-mod_md/server/config.c Fri Jan 5 22:04:52 2018
@@ -1951,6 +1951,15 @@ static const char *process_resource_conf
return NULL;
}
+ else if (optional) {
+ /* If the optinal flag is set (like for IncludeOptional) we can
+ * tolerate that no file or directory is present and bail out.
+ */
+ apr_finfo_t finfo;
+ if (apr_stat(&finfo, fname, APR_FINFO_TYPE, ptemp) != APR_SUCCESS
+ || finfo.filetype == APR_NOFILE)
+ return NULL;
+ }
return ap_process_resource_config(s, fname, conftree, p, ptemp);
}
@@ -2001,6 +2010,12 @@ static const char *process_resource_conf
*/
rv = apr_dir_open(&dirp, path, ptemp);
if (rv != APR_SUCCESS) {
+ /* If the directory doesn't exist and the optional flag is set
+ * there is no need to return an error.
+ */
+ if (rv == APR_ENOENT && optional) {
+ return NULL;
+ }
return apr_psprintf(p, "Could not open config directory %s: %pm",
path, &rv);
}
Modified: httpd/httpd/branches/2.4.x-mod_md/server/mpm/event/event.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-mod_md/server/mpm/event/event.c?rev=1820360&r1=1820359&r2=1820360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-mod_md/server/mpm/event/event.c (original)
+++ httpd/httpd/branches/2.4.x-mod_md/server/mpm/event/event.c Fri Jan 5 22:04:52 2018
@@ -306,6 +306,7 @@ static void TO_QUEUE_APPEND(struct timeo
static void TO_QUEUE_REMOVE(struct timeout_queue *q, event_conn_state_t *el)
{
APR_RING_REMOVE(el, timeout_list);
+ APR_RING_ELEM_INIT(el, timeout_list);
apr_atomic_dec32(q->total);
--q->count;
}
@@ -797,17 +798,16 @@ static int start_lingering_close_blockin
apr_thread_mutex_lock(timeout_mutex);
TO_QUEUE_APPEND(q, cs);
rv = apr_pollset_add(event_pollset, &cs->pfd);
- apr_thread_mutex_unlock(timeout_mutex);
if (rv != APR_SUCCESS && !APR_STATUS_IS_EEXIST(rv)) {
- ap_log_error(APLOG_MARK, APLOG_ERR, rv, ap_server_conf, APLOGNO(03092)
- "start_lingering_close: apr_pollset_add failure");
- apr_thread_mutex_lock(timeout_mutex);
TO_QUEUE_REMOVE(q, cs);
apr_thread_mutex_unlock(timeout_mutex);
+ ap_log_error(APLOG_MARK, APLOG_ERR, rv, ap_server_conf, APLOGNO(03092)
+ "start_lingering_close: apr_pollset_add failure");
apr_socket_close(cs->pfd.desc.s);
ap_push_pool(worker_queue_info, cs->p);
return 0;
}
+ apr_thread_mutex_unlock(timeout_mutex);
return 1;
}
@@ -1053,17 +1053,18 @@ read_request:
apr_thread_mutex_lock(timeout_mutex);
TO_QUEUE_APPEND(cs->sc->wc_q, cs);
rc = apr_pollset_add(event_pollset, &cs->pfd);
- apr_thread_mutex_unlock(timeout_mutex);
if (rc != APR_SUCCESS && !APR_STATUS_IS_EEXIST(rc)) {
+ TO_QUEUE_REMOVE(cs->sc->wc_q, cs);
+ apr_thread_mutex_unlock(timeout_mutex);
ap_log_error(APLOG_MARK, APLOG_ERR, rc, ap_server_conf, APLOGNO(03465)
"process_socket: apr_pollset_add failure for "
"write completion");
- apr_thread_mutex_lock(timeout_mutex);
- TO_QUEUE_REMOVE(cs->sc->wc_q, cs);
- apr_thread_mutex_unlock(timeout_mutex);
apr_socket_close(cs->pfd.desc.s);
ap_push_pool(worker_queue_info, cs->p);
}
+ else {
+ apr_thread_mutex_unlock(timeout_mutex);
+ }
return;
}
else if (c->keepalive != AP_CONN_KEEPALIVE || c->aborted ||
@@ -1099,18 +1100,17 @@ read_request:
apr_thread_mutex_lock(timeout_mutex);
TO_QUEUE_APPEND(cs->sc->ka_q, cs);
rc = apr_pollset_add(event_pollset, &cs->pfd);
- apr_thread_mutex_unlock(timeout_mutex);
if (rc != APR_SUCCESS && !APR_STATUS_IS_EEXIST(rc)) {
+ TO_QUEUE_REMOVE(cs->sc->ka_q, cs);
+ apr_thread_mutex_unlock(timeout_mutex);
ap_log_error(APLOG_MARK, APLOG_ERR, rc, ap_server_conf, APLOGNO(03093)
"process_socket: apr_pollset_add failure for "
"keep alive");
- apr_thread_mutex_lock(timeout_mutex);
- TO_QUEUE_REMOVE(cs->sc->ka_q, cs);
- apr_thread_mutex_unlock(timeout_mutex);
apr_socket_close(cs->pfd.desc.s);
ap_push_pool(worker_queue_info, cs->p);
return;
}
+ apr_thread_mutex_unlock(timeout_mutex);
}
else if (cs->pub.state == CONN_STATE_SUSPENDED) {
apr_atomic_inc32(&suspended_count);
@@ -1394,7 +1394,6 @@ static void process_lingering_close(even
rv = apr_pollset_remove(event_pollset, pfd);
apr_thread_mutex_unlock(timeout_mutex);
AP_DEBUG_ASSERT(rv == APR_SUCCESS || APR_STATUS_IS_NOTFOUND(rv));
- TO_QUEUE_ELEM_INIT(cs);
rv = apr_socket_close(csd);
AP_DEBUG_ASSERT(rv == APR_SUCCESS);
@@ -1673,7 +1672,6 @@ static void * APR_THREAD_FUNC listener_t
TO_QUEUE_REMOVE(remove_from_q, cs);
rc = apr_pollset_remove(event_pollset, &cs->pfd);
apr_thread_mutex_unlock(timeout_mutex);
- TO_QUEUE_ELEM_INIT(cs);
/*
* Some of the pollset backends, like KQueue or Epoll