rse 98/03/19 23:56:57
Modified: . STATUS htdocs/manual new_features_1_3.html htdocs/manual/mod mod_proxy.html src CHANGES src/modules/proxy mod_proxy.c proxy_ftp.c proxy_http.c Log: Reanimation of an undocumented feature of mod_proxy: ProxyReceiveBufferSize Submitted by: Ralf S. Engelschall PR#: 1348 Revision Changes Path 1.199 +1 -0 apache-1.3/STATUS Index: STATUS =================================================================== RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.198 retrieving revision 1.199 diff -u -r1.198 -r1.199 --- STATUS 1998/03/20 07:29:48 1.198 +++ STATUS 1998/03/20 07:56:47 1.199 @@ -99,6 +99,7 @@ * Ralf's additional manual pages for the support programs * Ben Hyde's Configure check for unknown command switch * Martin's fix for src/helpers/fp2rp + * Ralf's reanimation of an undocumented directive: ProxyReceiveBufferSize Available Patches: 1.50 +2 -2 apache-1.3/htdocs/manual/new_features_1_3.html Index: new_features_1_3.html =================================================================== RCS file: /export/home/cvs/apache-1.3/htdocs/manual/new_features_1_3.html,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- new_features_1_3.html 1998/03/10 01:35:52 1.49 +++ new_features_1_3.html 1998/03/20 07:56:48 1.50 @@ -281,8 +281,8 @@ <LI>The critical path for static requests has fewer system calls. This generally helps all requests. (45 syscalls for a static request in 1.2 versus 22 in 1.3 in a well tuned configuration). - <LI><A HREF="mod/mod_proxy.html#receivebuffersize" - ><SAMP>ReceiveBufferSize</SAMP></A> + <LI><A HREF="mod/mod_proxy.html#proxyreceivebuffersize" + ><SAMP>ProxyReceiveBufferSize</SAMP></A> directive gives <CODE>mod_proxy</CODE>'s outgoing connections larger network buffers, for increased throughput. <LI>The low level I/O routines use <CODE>writev</CODE> (where available) 1.37 +46 -0 apache-1.3/htdocs/manual/mod/mod_proxy.html Index: mod_proxy.html =================================================================== RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/mod_proxy.html,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- mod_proxy.html 1998/03/04 08:53:52 1.36 +++ mod_proxy.html 1998/03/20 07:56:49 1.37 @@ -45,6 +45,7 @@ <LI><A HREF="#proxypass">ProxyPass</A> <LI><A HREF="#proxypassreverse">ProxyPassReverse</A> <LI><A HREF="#proxyblock">ProxyBlock</A> +<LI><A HREF="#proxyreceivebuffersize">ProxyReceiveBufferSize</A> <LI><A HREF="#noproxy">NoProxy</A> <LI><A HREF="#proxydomain">ProxyDomain</A> <LI><A HREF="#cacheroot">CacheRoot</A> @@ -318,6 +319,51 @@ </PRE> blocks connections to all sites. + +<HR> + +<H2><A NAME="proxyreceivebuffersize">ProxyReceiveBufferSize</A></H2> +<A + HREF="directive-dict.html#Syntax" + REL="Help" +><STRONG>Syntax:</STRONG></A> ProxyReceiveBufferSize <EM><bytes></EM><BR> +<A + HREF="directive-dict.html#Default" + REL="Help" +><STRONG>Default:</STRONG></A> <EM>None</EM><BR> +<A + HREF="directive-dict.html#Context" + REL="Help" +><STRONG>Context:</STRONG></A> server config, virtual host<BR> +<A + HREF="directive-dict.html#Override" + REL="Help" +><STRONG>Override:</STRONG></A> <EM>Not applicable</EM><BR> +<A + HREF="directive-dict.html#Status" + REL="Help" +><STRONG>Status:</STRONG></A> Base<BR> +<A + HREF="directive-dict.html#Module" + REL="Help" +><STRONG>Module:</STRONG></A> mod_proxy<BR> +<A + HREF="directive-dict.html#Compatibility" + REL="Help" +><STRONG>Compatibility:</STRONG></A> ProxyReceiveBufferSize is only available in +Apache 1.3 and later.<P> + +The ProxyReceiveBufferSize directive specifies an explicit network buffer size +for outgoing HTTP and FTP connections, for increased throughput. It has to be +greater then 512 or set to 0 to indicate that the systems default buffer size +should be used. + +<P> +Example: + +<PRE> + ProxyReceiveBufferSize 2048 +</PRE> <HR> 1.725 +6 -0 apache-1.3/src/CHANGES Index: CHANGES =================================================================== RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.724 retrieving revision 1.725 diff -u -r1.724 -r1.725 --- CHANGES 1998/03/20 07:29:49 1.724 +++ CHANGES 1998/03/20 07:56:51 1.725 @@ -1,5 +1,11 @@ Changes with Apache 1.3b6 + *) Reanimated the (still undocumented) proxy receive buffer size directive: + Renamed from ReceiveBufferSize to ProxyReceiveBufferSize because the old + name was really too generic, added documentation for this directive to + the mod_proxy.html and corrected the hyperlink to it in the + new_features_1.3.html document. [Ralf S. Engelschall, PR#1348] + *) Fix a bug in the src/helpers/fp2rp script and make it a little bit faster [Martin Kraemer] 1.47 +5 -5 apache-1.3/src/modules/proxy/mod_proxy.c Index: mod_proxy.c =================================================================== RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/mod_proxy.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- mod_proxy.c 1998/03/13 19:20:23 1.46 +++ mod_proxy.c 1998/03/20 07:56:54 1.47 @@ -728,7 +728,7 @@ get_module_config(parms->server->module_config, &proxy_module); int s = atoi(arg); if (s < 512 && s != 0) { - return "ReceiveBufferSize must be >= 512 bytes, or 0 for system default."; + return "ProxyReceiveBufferSize must be >= 512 bytes, or 0 for system default."; } psf->recv_buffer_size = s; @@ -752,7 +752,9 @@ {"ProxyPassReverse", add_pass_reverse, NULL, RSRC_CONF, TAKE2, "a virtual path and a URL for reverse proxy behaviour"}, {"ProxyBlock", set_proxy_exclude, NULL, RSRC_CONF, ITERATE, - "A list of names, hosts or domains to which the proxy will not connect"}, + "A list of names, hosts or domains to which the proxy will not connect"}, + {"ProxyReceiveBufferSize", set_recv_buffer_size, NULL, RSRC_CONF, TAKE1, + "Receive buffer size for outgoing HTTP and FTP connections in bytes"}, {"NoProxy", set_proxy_dirconn, NULL, RSRC_CONF, ITERATE, "A list of domains, hosts, or subnets to which the proxy will connect directly"}, {"ProxyDomain", set_proxy_domain, NULL, RSRC_CONF, TAKE1, @@ -774,9 +776,7 @@ {"CacheDirLength", set_cache_dirlength, NULL, RSRC_CONF, TAKE1, "The number of characters in subdirectory names"}, {"NoCache", set_cache_exclude, NULL, RSRC_CONF, ITERATE, - "A list of names, hosts or domains for which caching is *not* provided"}, - {"ReceiveBufferSize", set_recv_buffer_size, NULL, RSRC_CONF, TAKE1, - "Receive buffer size in bytes"}, + "A list of names, hosts or domains for which caching is *not* provided"}, {NULL} }; 1.51 +2 -2 apache-1.3/src/modules/proxy/proxy_ftp.c Index: proxy_ftp.c =================================================================== RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/proxy_ftp.c,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- proxy_ftp.c 1998/03/14 12:22:08 1.50 +++ proxy_ftp.c 1998/03/20 07:56:55 1.51 @@ -521,7 +521,7 @@ (const char *) &conf->recv_buffer_size, sizeof(int)) == -1) { proxy_log_uerror("setsockopt", "(SO_RCVBUF)", - "Failed to set RecvBufferSize, using default", + "Failed to set ProxyReceiveBufferSize, using default", r->server); } } @@ -720,7 +720,7 @@ if (setsockopt(dsock, SOL_SOCKET, SO_RCVBUF, (const char *) &conf->recv_buffer_size, sizeof(int)) == -1) { proxy_log_uerror("setsockopt", "(SO_RCVBUF)", - "Failed to set RecvBufferSize, using default", r->server); + "Failed to set ProxyReceiveBufferSize, using default", r->server); } } 1.43 +1 -1 apache-1.3/src/modules/proxy/proxy_http.c Index: proxy_http.c =================================================================== RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/proxy_http.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- proxy_http.c 1998/03/16 19:34:59 1.42 +++ proxy_http.c 1998/03/20 07:56:55 1.43 @@ -253,7 +253,7 @@ (const char *) &conf->recv_buffer_size, sizeof(int)) == -1) { proxy_log_uerror("setsockopt", "(SO_RCVBUF)", - "Failed to set RecvBufferSize, using default", + "Failed to set ReceiveBufferSize, using default", r->server); } }