cvs commit: apache-1.3/src/modules/proxy proxy_http.c proxy_util.c
martin 98/03/22 14:21:03 Modified:src/modules/proxy proxy_http.c proxy_util.c Log: Add proxy capabilities to EBCDIC port: until now, each cached file would be converted twice when not in the cache, and converted once if in the cache (this would deliver incorrect contents). Now the cache contains always the (unconverted) message body in ASCII format. This seems reasonable because the cache has no "user interface". (The header lines are still stored in EBCDIC in the cache because they must be evaluated by the proxy module). Revision ChangesPath 1.44 +9 -1 apache-1.3/src/modules/proxy/proxy_http.c Index: proxy_http.c === RCS file: /home/cvs/apache-1.3/src/modules/proxy/proxy_http.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -u -r1.43 -r1.44 --- proxy_http.c 1998/03/20 07:56:55 1.43 +++ proxy_http.c 1998/03/22 22:21:01 1.44 @@ -195,7 +195,7 @@ urlptr = strstr(url, "://"); if (urlptr == NULL) - return BAD_REQUEST; + return HTTP_BAD_REQUEST; urlptr += 3; destport = DEFAULT_HTTP_PORT; strp = strchr(urlptr, '/'); @@ -441,6 +441,14 @@ cache = proxy_cache_error(c); } kill_timeout(r); + +#ifdef CHARSET_EBCDIC +/* What we read/write after the header should not be modified + * (i.e., the cache copy is ASCII, not EBCDIC, even for text/html) + */ +bsetflag(f, B_ASCII2EBCDIC|B_EBCDIC2ASCII, 0); +bsetflag(r->connection->client, B_ASCII2EBCDIC|B_EBCDIC2ASCII, 0); +#endif /* send body */ /* if header only, then cache will be NULL */ 1.52 +8 -0 apache-1.3/src/modules/proxy/proxy_util.c Index: proxy_util.c === RCS file: /home/cvs/apache-1.3/src/modules/proxy/proxy_util.c,v retrieving revision 1.51 retrieving revision 1.52 diff -u -u -r1.51 -r1.52 --- proxy_util.c 1998/03/21 05:32:19 1.51 +++ proxy_util.c 1998/03/22 22:21:02 1.52 @@ -430,6 +430,14 @@ total_bytes_sent = 0; +#ifdef CHARSET_EBCDIC +/* The cache copy is ASCII, not EBCDIC, even for text/html) */ +bsetflag(f, B_ASCII2EBCDIC|B_EBCDIC2ASCII, 0); +if (f2 != NULL) + bsetflag(f2, B_ASCII2EBCDIC|B_EBCDIC2ASCII, 0); +bsetflag(con->client, B_ASCII2EBCDIC|B_EBCDIC2ASCII, 0); +#endif + /* Since we are reading from one buffer and writing to another, * it is unsafe to do a soft_timeout here, at least until the proxy * has its own timeout handler which can set both buffers to EOUT.
Re: cvs commit: apache-1.3/htdocs/manual/mod core.html
On 21 Mar 1998 [EMAIL PROTECTED] wrote: > Log: > "Has no effect on MS Windows" is rather misleading. > --- core.html 1998/03/21 17:13:56 1.105 > +++ core.html 1998/03/21 22:31:53 1.106 > @@ -1634,7 +1634,8 @@ >Tuning of this parameter should only be necessary on very busy sites. >Setting this parameter to a large number is almost always a bad idea. > > -This directive has no effect on Microsoft Windows. > +This directive has no effect when used with the Apache Web server on a > +Microsoft Windows platform. What am I missing here? Why is it misleading to say the directive has no effect on Windows? It does have no effect. There is no need for the qualifying "when using with the Apache Web server" because the documents are for Apache so why would anyone think it has an effect on any other software? Or if it is needed, make sure that all the other statements about what works with NT vs. Unix also have the qualification "when used with Apache", for example, StartServers, ThreadsPerChild, MinSpareServers. Paul
cvs commit: apache-1.3/src/support ab.c
marc98/03/21 17:31:50 Modified:src/support ab.c Log: Only need one break. Revision ChangesPath 1.3 +0 -1 apache-1.3/src/support/ab.c Index: ab.c === RCS file: /export/home/cvs/apache-1.3/src/support/ab.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ab.c 1998/03/19 09:56:41 1.2 +++ ab.c 1998/03/22 01:31:49 1.3 @@ -660,7 +660,6 @@ case 'c': concurrency = atoi(optarg); break; -break; case 't': tlimit = atoi(optarg); requests = MAX_REQUESTS;/* need to size data array on something */
cvs commit: apache-1.3 STATUS
coar98/03/21 16:59:48 Modified:.STATUS Log: Oops, missed Sameer's vote. Revision ChangesPath 1.203 +1 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.202 retrieving revision 1.203 diff -u -r1.202 -r1.203 --- STATUS1998/03/22 00:49:07 1.202 +++ STATUS1998/03/22 00:59:47 1.203 @@ -108,7 +108,7 @@ * Ken's slight reworking of the Apache LICENSE to clarify the restricted nature of usage of the name "Apache" in derived products Status: Ken +1, Paul +1, Ben +1, Jim +1, Randy +1, Roy +1, - Chuck +1, MarkC +1, Ralf +1 + Chuck +1, MarkC +1, Ralf +1, Sameer +1 Concepts:
cvs commit: apache-1.3 STATUS
coar98/03/21 16:49:08 Modified:.STATUS Log: Add notice of proposed license change for 1.3 and following. Revision ChangesPath 1.202 +6 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.201 retrieving revision 1.202 diff -u -r1.201 -r1.202 --- STATUS1998/03/21 06:41:38 1.201 +++ STATUS1998/03/22 00:49:07 1.202 @@ -99,11 +99,16 @@ * 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 reanim. of (undocumented) directive: ProxyReceiveBufferSize, PR#1348 +* Ralf's reanim. of (undocumented) directive: ProxyReceiveBufferSize, + PR#1348 * Ralf's mod_proxy fix to use FTP SIZE response for Content-Length, PR#1183 Available Patches: +* Ken's slight reworking of the Apache LICENSE to clarify the restricted + nature of usage of the name "Apache" in derived products + Status: Ken +1, Paul +1, Ben +1, Jim +1, Randy +1, Roy +1, + Chuck +1, MarkC +1, Ralf +1 Concepts:
