X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=mod_proxy_fdpass.c;h=ff3e684b213004fff888ec6bb6c3d1ae5a03e7a7;hb=34a20c86b2a1e8b901cdf1e8583e261dea69b80b;hp=90137e4b1f9f433bbd57788874530d96df70698b;hpb=a59172b97aa1161c13d143bd0a36bec59ac21a95;p=mod-proxy-fdpass.git diff --git a/mod_proxy_fdpass.c b/mod_proxy_fdpass.c index 90137e4..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); @@ -286,8 +286,8 @@ int util_read(request_rec *r, const char **rbuf) int rsize, len_read, rpos=0; long length = r->remaining; *rbuf = (char *)apr_pcalloc(r->pool, length +1); - while ((len_read = ap_get_client_block(r, argsbuffer, -sizeof(argsbuffer))) > 0) { + if ((len_read = ap_get_client_block(r, argsbuffer, + sizeof(argsbuffer))) > 0) { if ((rpos + len_read) > length) { rsize = length - rpos; } else { @@ -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 ! */