httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Andrew Wilson <awil...@hyperreal.com>
Subject NeXT patches to 1.0.0 (fwd)
Date Sun, 21 Jan 1996 13:13:03 GMT
Ack sent.  I'll break out these patches and upload them in a minnit.
I've asked for the other diffs Martijn made especially the CERN
negotiation thingie.  Which reminds me, I still haven't broken out
the big patch list we got sent a while back.  Damn, more homework.

Forwarded message:
> From mak@beach.webcrawler.com  Fri Jan 12 12:41:38 1996
> Message-Id: <9601122041.AA20019@webcrawler.com>
> To: apache-bugs@apache.org
> Cc: bp@beach.webcrawler.com
> Subject: NeXT patches to 1.0.0
> From: Martijn Koster <m.koster@webcrawler.com>
> Reply-To: Martijn Koster <m.koster@webcrawler.com>
> Date: Fri, 12 Jan 1996 12:41:35 -0800
> Sender: mak@beach.webcrawler.com
> 
> 
> Hi guys, 
> 
> just finished recoding the WebCrawler modifications to apache 0.8.11
> as new modules under apache_1.0.0 -- seems to work great!
> 
> I noticed two probably NeXT specific problems:
> 
> - the setsockopt doesn't take a const declared argument,
> 
> - the time format still used the %T which isn't implemented under
>    NeXT (and others?). I thought we reported this before...
> 
> Diffs for these are appended. Other than that had a clean compile.
> 
> Other mods we made to the main code for your consideration:
> 
> - switched off default referer/useragent logging
> - added a "struct in_addr" in the request structure,
>   for a faster binary logging in a seperate module
> - code mods to not negotiate with proxies (seeing as the variant handling
>   broken at least in CERN...)
> 
> diffs available on request.
> 
> Cheers,
> 
> -- Martijn
> 
> 
> diff -c ../../apache_1.0.0.orig/src/http_main.c ./http_main.c
> *** ../../apache_1.0.0.orig/src/http_main.c     Tue Jan  9 14:51:09
> *** 1996
> --- ./http_main.c       Thu Jan 11 13:27:15 1996
> ***************
> *** 906,918 ****
> --- 906,926 ----
>   
>       note_cleanups_for_fd (pconf, sd); /* arrange to close on exec or
> restart */
>       
> + #ifdef NEXT
> +     if((setsockopt(sd,SOL_SOCKET,SO_REUSEADDR,(char*)&one,sizeof(one)))
> + #else
>       if((setsockopt(sd,SOL_SOCKET,SO_REUSEADDR,(const char*)&one,sizeof(one)))+
#endif
>          == -1) {
>           fprintf(stderr,"httpd: could not set socket option\n");
>           perror("setsockopt");
>           exit(1);
>       }
> + #ifdef NEXT
> +     if((setsockopt(sd,SOL_SOCKET,SO_KEEPALIVE,(void*)&keepalive_value,
> + #else
>       if((setsockopt(sd,SOL_SOCKET,SO_KEEPALIVE,(const void*)&keepalive_value,
> + #endif
>           sizeof(keepalive_value))) == -1) {
>           fprintf(stderr,"httpd: could not set socket option
> SO_KEEPALIVE\n"); 
>           perror("setsockopt"); 
> 
> diff -c ../../apache_1.0.0.orig/src/httpd.h ./httpd.h
> *** ../../apache_1.0.0.orig/src/httpd.h Tue Jan  9 14:51:11 1996
> --- ./httpd.h   Fri Jan 12 08:45:23 1996
> ***************
> *** 151,157 ****
>   #define MAX_HEADERS 200
>   
>   /* RFC 1123 format for date - this is what HTTP/1.0 wants */
> ! #define HTTP_TIME_FORMAT "%a, %d %b %Y %T GMT"
>   
>   /* Number of servers to spawn off by default --- also, if fewer than
>    * this free when the caretaker checks, it will spawn more.
> --- 151,158 ----
>   #define MAX_HEADERS 200
>   
>   /* RFC 1123 format for date - this is what HTTP/1.0 wants */
> ! /* Note that %T isn't support everywhere, but %H:%M:%S is */
> ! #define HTTP_TIME_FORMAT "%a, %d %b %Y %H:%M:%S GMT"
>   
>   /* Number of servers to spawn off by default --- also, if fewer than
>    * this free when the caretaker checks, it will spawn more.
> 


Mime
View raw message