From 34a20c86b2a1e8b901cdf1e8583e261dea69b80b Mon Sep 17 00:00:00 2001 From: "Matteo Nastasi (mop)" Date: Thu, 21 Mar 2013 10:11:18 +0100 Subject: [PATCH] debug log disabled --- debian/changelog | 6 ++++++ mod_proxy_fdpass.c | 27 ++++++++++++++++----------- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5f95369..5d7a3b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mod-proxy-fdpass (0.1.1-1) unstable; urgency=low + + * Log for debugging disabled + + -- Matteo Nastasi Thu, 21 Mar 2013 10:07:13 +0100 + mod-proxy-fdpass (0.1.0-1) unstable; urgency=low * First backport of fdpass module diff --git a/mod_proxy_fdpass.c b/mod_proxy_fdpass.c index 29b89db..ff3e684 100644 --- a/mod_proxy_fdpass.c +++ b/mod_proxy_fdpass.c @@ -62,8 +62,8 @@ static int proxy_fdpass_canon(request_rec *r, char *url) r->filename = apr_pstrcat(r->pool, "proxy:fd://", path, NULL); - ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, - "proxy: FD: set r->filename to %s", r->filename); + /* ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, + "proxy: FD: set r->filename to %s", r->filename); */ return OK; } @@ -90,12 +90,12 @@ static apr_status_t socket_connect_un(request_rec *r, apr_socket_t *sock, } do { - ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, - "proxy: FD: pre_connect"); + /* ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, + "proxy: FD: pre_connect"); */ rv = connect(rawsock, (struct sockaddr*)sa, sizeof(*sa) /* + strlen(sa->sun_path)*/ ); - ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, - "proxy: FD: post_connect %d", rv); + /* ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, + "proxy: FD: post_connect %d", rv); */ } while (rv == -1 && errno == EINTR); if ((rv == -1) && (errno == EINPROGRESS || errno == EALREADY) @@ -135,9 +135,9 @@ static apr_status_t get_socket_from_path(request_rec *r, apr_pool_t *p, ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, "proxy: FD: Failed to connect to '%s' %d xxx", url, rv); - */ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, "proxy: FD: get_socket_from_path::START"); + */ rv = apr_socket_create(&s, AF_UNIX, SOCK_STREAM, 0, p); @@ -389,17 +389,20 @@ static int proxy_fdpass_handler(request_rec *r, proxy_worker *worker, fg = ap_get_output_filter_handle("HTTP_HEADER"); - + /* ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "proxy: FD: filter fg: %lx func %lx", fg, ap_http_header_filter); - + */ for (f = r->output_filters ; f != NULL ; f = f->next) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, - "proxy: FD: filter loop: %lx", f->frec); + /* ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, + "proxy: FD: filter loop: %lx", f->frec); + */ if (f->frec == fg) { + /* ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "proxy: FD: filter found, remove it"); + */ ap_remove_output_filter(f); break; } @@ -461,10 +464,12 @@ static int proxy_fdpass_handler(request_rec *r, proxy_worker *worker, } } + /* if ((buf = apr_table_get(r->headers_in, "Host"))) { ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, "proxy: FD: Host is: [%s]", buf); } + */ /* XXXXX: THIS IS AN EVIL HACK */ /* There should really be a (documented) public API for this ! */ -- 2.17.1