httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Martin Kraemer <Martin.Krae...@mch.sni.de>
Subject Re: [PATCH] (Was: Re: OS/390 Translation)
Date Mon, 06 Dec 1999 23:30:10 GMT
On Mon, Dec 06, 1999 at 04:03:31PM -0700, pg@sweng.stortek.com wrote:
> Basic function works on OS/390 with the tables so coalesced.
> I haven't tested proxy function.  I haven't tested or addressed
> any changes in os/tpf or os/bs2000.

Uuh! I'm astonished that there were so few places wit \012's!

> I added the new macro definitions to an existing "#ifdef" in
> httpd.h (actually moved some from mod_proxy.h).  Are there
> any opinions whether these macros should remain in httpd.h, or
> is there a more suitable place, such as ap_config.h?

Maybe the AP_OS_TOASCII() could even be abbreviated as AP_ASC(ch)?
Personally, I'd leave them in httpd.h What do the others think?

> I must relinquish any claim to originality -- apparently someone
> else had started this entire scheme in mod_proxy.h and proxy_ftp.c,
> but not followed through with it.

I didn't dare ;-) When I'm making changes / doing cleanup in the proxy
I'm free to do many things which I could not do as global changes.
Or at least I would have to fight for a consensus much more.

> diff -bru orig/apache-1.3/src/main/util_script.c apache-1.3/src/main/util_script.c
> --- orig/apache-1.3/src/main/util_script.c	Sat Nov 27 10:12:37 1999
> +++ apache-1.3/src/main/util_script.c	Mon Dec  6 14:01:34 1999
> @@ -486,8 +486,12 @@
>  	/* Delete terminal (CR?)LF */
>  
>  	p = strlen(w);
> +        /* Indeed, the host's '\n':
> +           '\012' for UNIX; '\015' for MacOS; '\025' for OS/390
> +           -- whatever the script generates.
> +        */
>  	if (p > 0 && w[p - 1] == '\n') {
> -	    if (p > 1 && w[p - 2] == '\015') {
> +	    if (p > 1 && w[p - 2] == CR) {

Hmmm. Is this correct for MacOS? We have an ASCII based OS, so
CR == '\015', but the '\n' one line above is *also* '\015'.

Otherwise: untested +1 (maybe I'll find the time to compile it tomorrow).

    Martin
-- 
<Martin.Kraemer@MchP.Siemens.De>             |    Fujitsu Siemens
Fon: +49-89-636-46021, FAX: +49-89-636-41143 | 81730  Munich,  Germany

Mime
View raw message