Re: cvs commit: apache RULES.CVS
Ermmm ... wasn't it you who said not to have discussions on apache-cvs a while
back?
Anyway...
In reply to Ben Laurie who said
ben 96/03/18 02:28:23
Added: . RULES.CVS
Log:
First attempt at a rules file for CVS. Note that I didn't make these
rules
up, I'm just writing down what I see as the consensus.
Looks like a reasonable start. I guess rule 4 is down to me :-)
Only thing is, do we really want it in that particular location? Maybe
we should have a docs directory under apache that holds all these
files.
Perhaps.
Some other things I'd like to see would be a style guide and a how to
send us a patch guide.
On the style guide issue, I started to clean up some warnings yesterday
and the code style varies *A LOT* across different files. This makes it
very hard to see quickly what is happening and in some cases the coding
style is just simply bizarre by most common standards (everyone has
their personal taste I guess). For a group project I think some basic
coding standards would be a good idea.
I'd agree, except that almost noone likes the style I prefer.
I've always been a fan of the Berkeley style, I can dig up their
style guide if people think this is a good idea. I'll even volunteer
to clean up the current sources once we agree on a guide.
One thing I cannot bear is any style where the opening { doesn't align
(vertically) with the closing }. Where does Bark-Lee stand on this?
Also, I'm a fan of Hungarian (as anyone who has read the Apache-SSL source will
have guessed) - I'd like to see that used.
If we do this, I insist on clear instructions on how to make Emacs do it ;-)
But, lets start this thread again on the RIGHT list!
Cheers,
Ben.
--
Paul Richards. Originative Solutions Ltd. (Netcraft Ltd. contractor)
Elsevier Science TIS online journal project.
Email: [EMAIL PROTECTED]
Phone: 0370 462071 (Mobile), +44 (0)1865 843155
--
Ben Laurie Phone: +44 (181) 994 6435
Freelance Consultant andFax: +44 (181) 994 6472
Technical Director Email: [EMAIL PROTECTED]
A.L. Digital Ltd, URL: http://www.algroup.co.uk
London, England.
cvs commit: apache/src mod_proxy.c
ben 96/03/30 07:38:42 Modified:src mod_proxy.c Log: (Oops) Quickly fix // style comments before people shout at me. Revision ChangesPath 1.12 +6 -4 apache/src/mod_proxy.c Index: mod_proxy.c === RCS file: /export/home/cvs/apache/src/mod_proxy.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C3 -r1.11 -r1.12 *** mod_proxy.c 1996/03/30 15:31:14 1.11 --- mod_proxy.c 1996/03/30 15:38:41 1.12 *** *** 1403,1409 ++nfiles; /* is it another file? */ /* FIXME: Shouldn't any unexpected files be deleted? */ ! // if (strlen(ent-d_name) != HASH_LEN) continue; /* read the file */ fd = open(filename, O_RDONLY); --- 1403,1409 ++nfiles; /* is it another file? */ /* FIXME: Shouldn't any unexpected files be deleted? */ ! /* if (strlen(ent-d_name) != HASH_LEN) continue; */ /* read the file */ fd = open(filename, O_RDONLY); *** *** 1941,1949 #define TMPFILESTR /#tmpXX c-tempfile=palloc(r-pool,strlen(conf-cache.root)+sizeof TMPFILESTR-1); strcpy(c-tempfile,conf-cache.root); ! //p = strrchr(c-tempfile, '/'); ! //if (p == NULL) return DECLINED; ! //strcpy(p, TMPFILESTR); strcat(c-tempfile,TMPFILESTR); #undef TMPFILESTR p = mktemp(c-tempfile); --- 1941,1951 #define TMPFILESTR /#tmpXX c-tempfile=palloc(r-pool,strlen(conf-cache.root)+sizeof TMPFILESTR-1); strcpy(c-tempfile,conf-cache.root); ! /* ! p = strrchr(c-tempfile, '/'); ! if (p == NULL) return DECLINED; ! strcpy(p, TMPFILESTR); ! */ strcat(c-tempfile,TMPFILESTR); #undef TMPFILESTR p = mktemp(c-tempfile);
cvs commit: apache/src mod_proxy.c
ben 96/03/01 05:12:34 Modified:src mod_proxy.c Log: (int) NULL is a most disgusting construct, and wrong anyway - to invalidate a file descriptor you should use -1, not 0. Revision ChangesPath 1.6 +1 -1 apache/src/mod_proxy.c
cvs commit: apache/src mod_dir.c
ben 96/04/12 10:45:06
Modified:src mod_dir.c
Log:
Fix a curious and strictly incorrect declaration.
Reported By: Igor Sereda [EMAIL PROTECTED]
Revision ChangesPath
1.7 +1 -1 apache/src/mod_dir.c
Index: mod_dir.c
===
RCS file: /export/home/cvs/apache/src/mod_dir.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C3 -r1.6 -r1.7
*** mod_dir.c 1996/04/09 19:08:40 1.6
--- mod_dir.c 1996/04/12 17:45:03 1.7
***
*** 617,623
t2 = pstrcat(scratch, t2, /A, NULL);
} else
{
! char buff[23]= ;
t2 = escape_html(scratch, t);
buff[23-len] = '\0';
t2 = pstrcat(scratch, t2, /A, buff, NULL);
--- 617,623
t2 = pstrcat(scratch, t2, /A, NULL);
} else
{
! char *buff= ;
t2 = escape_html(scratch, t);
buff[23-len] = '\0';
t2 = pstrcat(scratch, t2, /A, buff, NULL);
cvs commit: apache/src http_main.c
ben 96/04/17 09:36:36
Modified:src http_main.c
Log:
Various system calls were not logging errors properly. Fixed.
Revision ChangesPath
1.23 +4 -4 apache/src/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache/src/http_main.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C3 -r1.22 -r1.23
*** http_main.c 1996/04/11 19:38:38 1.22
--- http_main.c 1996/04/17 16:36:34 1.23
***
*** 534,540
perror(shmctl);
fprintf(stderr, httpd: Could not delete segment #%d\n, shmid);
sprintf(errstr, could not remove shared memory segment #%d, shmid);
! log_error(errstr, server_conf);
}
if (scoreboard_image == BADSHMAT) /* now bailout */
exit(1);
--- 534,540
perror(shmctl);
fprintf(stderr, httpd: Could not delete segment #%d\n, shmid);
sprintf(errstr, could not remove shared memory segment #%d, shmid);
! log_unixerr(shmctl,IPC_RMID,errstr, server_conf);
}
if (scoreboard_image == BADSHMAT) /* now bailout */
exit(1);
***
*** 919,925
uid_t uid=atoi(user_name[1]);
if ((ent = getpwuid(uid)) == NULL) {
! log_error(couldn't determine user name from uid, server_conf);
exit(1);
}
--- 919,925
uid_t uid=atoi(user_name[1]);
if ((ent = getpwuid(uid)) == NULL) {
! log_unixerr(getpwuid,NULL,couldn't determine user name from uid,
server_conf);
exit(1);
}
***
*** 1131,1137
memcpy(fds, listenfds, sizeof(fd_set));
csd = select(listenmaxfd+1, fds, NULL, NULL, NULL);
if (csd == -1 errno != EINTR)
! log_error(select error, server_conf);
if (csd = 0) continue;
for (sd=listenmaxfd; sd = 0; sd--)
if (FD_ISSET(sd, fds)) break;
--- 1131,1137
memcpy(fds, listenfds, sizeof(fd_set));
csd = select(listenmaxfd+1, fds, NULL, NULL, NULL);
if (csd == -1 errno != EINTR)
! log_unixerr(select,NULL,select error, server_conf);
if (csd = 0) continue;
for (sd=listenmaxfd; sd = 0; sd--)
if (FD_ISSET(sd, fds)) break;
***
*** 1146,1152
} else
while ((csd=accept(sd, sa_client, clen)) == -1)
if (errno != EINTR)
! log_error(socket error: accept failed, server_conf);
accept_mutex_off(); /* unlock after accept */
--- 1146,1152
} else
while ((csd=accept(sd, sa_client, clen)) == -1)
if (errno != EINTR)
! log_unixerr(accept,NULL,socket error: accept failed,
server_conf);
accept_mutex_off(); /* unlock after accept */
cvs commit: apache/src Makefile.tmpl
ben 96/06/14 09:24:28 Modified:src Makefile.tmpl Log: Submitted by: Heiko Schlittermann [EMAIL PROTECTED] Reviewed by: Ben Laurie Yes, there is a better way to generate an error than 'expr '. Doh! Revision ChangesPath 1.14 +1 -3 apache/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache/src/Makefile.tmpl,v retrieving revision 1.13 retrieving revision 1.14 diff -C3 -r1.13 -r1.14 *** Makefile.tmpl 1996/06/11 20:44:22 1.13 --- Makefile.tmpl 1996/06/14 16:24:26 1.14 *** *** 17,25 @echo Consider copying Configuration.tmpl to Configuration, editing and rerunning @echo Configure. @echo If not, you will at least have to touch Configuration. ! # Use expr to generate an error code (exit doesn't work). Nasty. If anyone ! # knows a better way, let me know ([EMAIL PROTECTED]). ! @expr httpd: $(OBJS) $(CC) $(LFLAGS) $(AUX_LFLAGS) -o httpd $(OBJS) $(EXTRA_LIBS) $(AUX_LIBS) --- 17,23 @echo Consider copying Configuration.tmpl to Configuration, editing and rerunning @echo Configure. @echo If not, you will at least have to touch Configuration. ! @false httpd: $(OBJS) $(CC) $(LFLAGS) $(AUX_LFLAGS) -o httpd $(OBJS) $(EXTRA_LIBS) $(AUX_LIBS)
cvs commit: apache/src CHANGES
ben 96/06/22 06:32:25 Modified:src CHANGES Log: Correct spelling/grammar. Reintroduce attributions (where I can remember them). Revision ChangesPath 1.34 +16 -12apache/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.33 retrieving revision 1.34 diff -C3 -r1.33 -r1.34 *** CHANGES 1996/06/21 20:12:06 1.33 --- CHANGES 1996/06/22 13:32:23 1.34 *** *** 1,10 ! *) Allow ScanHTMLTitles to work with lowercase title tags. Changes with Apache 1.1b4: ! *) r-bytes_sent variable restored ! *) Previously broken multi-method Limit parsing fixed. *) More possibly unsecure programs removed from the support directory. --- 1,13 ! *) Allow ScanHTMLTitles to work with lowercase title tags. [Alexei Kosut] ! ! *) Bugs which were fixed: ! a) yet more mod_proxy bugs [Ben Laurie] Changes with Apache 1.1b4: ! *) r-bytes_sent variable restored. [Robert Thau] ! *) Previously broken multi-method Limit parsing fixed. [Robert Thau] *) More possibly unsecure programs removed from the support directory. *** *** 13,19 *) VirtualHosts based on Host: headers no longer conflict with the Listen directive. ! *) OS/2 compatibility enhancements. *) POST now allowed to directory index CGI scripts. --- 16,22 *) VirtualHosts based on Host: headers no longer conflict with the Listen directive. ! *) OS/2 compatibility enhancements. [Gary Smiley] *) POST now allowed to directory index CGI scripts. *** *** 35,43 merge multiple instances, since certain popular browsers can not handle multiple Set-Cookie instructions in a single header. ! *) rprintf() added to buffer code, occurances of sprintf removed. ! *) CONNECT method for proxy module, which means tunning SSL should work. (No crypto needed) Also a NoCache config directive. *) Several API additions: pstrndup(), table_unset() and get_token() --- 38,47 merge multiple instances, since certain popular browsers can not handle multiple Set-Cookie instructions in a single header. ! *) rprintf() added to buffer code, occurrences of sprintf removed. ! [Ben Laurie] ! *) CONNECT method for proxy module, which means tunneling SSL should work. (No crypto needed) Also a NoCache config directive. *) Several API additions: pstrndup(), table_unset() and get_token() *** *** 47,73 URL's. *) New info module which reports on installed module set through a ! special URL, a la mod_status *) ServerPath directive added - allows for graceful transition for Host:-header-based virtual hosts. ! *) Anonymous authentication module improvements ! *) MSQL authentication module improvements ! *) Status module design improved - output now tables-based *) htdigest utility included for use with digest authentication module. *) mod_negotiation: Accept values with wildcards to be treated with less priority than those without wildcards at the same quality ! value. *) Bugs which were fixed: a) numerous mod_proxy bugs ! b) CGI early-termination bug c) Keepalives not working with virtual hosts d) RefererIgnore problems e) closing fd's twice in mod_include (causing core dumps on --- 51,77 URL's. *) New info module which reports on installed module set through a ! special URL, a la mod_status. *) ServerPath directive added - allows for graceful transition for Host:-header-based virtual hosts. ! *) Anonymous authentication module improvements. ! *) MSQL authentication module improvements. ! *) Status module design improved - output now table-based. [Ben Laurie] *) htdigest utility included for use with digest authentication module. *) mod_negotiation: Accept values with wildcards to be treated with less priority than those without wildcards at the same quality ! value. [Alexei Kosut] *) Bugs which were fixed: a) numerous mod_proxy bugs ! b) CGI early-termination bug [Ben Laurie] c) Keepalives not working with virtual hosts d) RefererIgnore problems e) closing fd's twice in mod_include (causing core dumps on
cvs commit: apache/src CHANGES http_config.c
ben 96/06/29 12:52:13 Modified:src CHANGES http_config.c Log: Virtual hosts couldn't have keepalive didn't. Fixed. Revision ChangesPath 1.36 +3 -0 apache/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.35 retrieving revision 1.36 diff -C3 -r1.35 -r1.36 *** CHANGES 1996/06/26 22:52:09 1.35 --- CHANGES 1996/06/29 19:52:10 1.36 *** *** 1,3 --- 1,6 + *) Make virtual hosts default to main server keepalive parameters. + [Alexei Kosut, Ben Laurie] + *) Allow ScanHTMLTitles to work with lowercase title tags. [Alexei Kosut] *) Bugs which were fixed: 1.13 +2 -2 apache/src/http_config.c Index: http_config.c === RCS file: /export/home/cvs/apache/src/http_config.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C3 -r1.12 -r1.13 *** http_config.c 1996/06/28 19:28:00 1.12 --- http_config.c 1996/06/29 19:52:11 1.13 *** *** 653,659 s-access_confname = NULL; s-timeout = 0; s-keep_alive_timeout = 0; ! s-keep_alive = 0; s-host_addr.s_addr = get_virthost_addr (hostname, s-host_port); s-port = s-host_port; /* set them the same, by default */ s-next = NULL; --- 653,659 s-access_confname = NULL; s-timeout = 0; s-keep_alive_timeout = 0; ! s-keep_alive = -1; s-host_addr.s_addr = get_virthost_addr (hostname, s-host_port); s-port = s-host_port; /* set them the same, by default */ s-next = NULL; *** *** 703,709 if (virt-keep_alive_timeout == 0) virt-keep_alive_timeout = main_server-keep_alive_timeout; ! if (virt-keep_alive == 0) virt-keep_alive = main_server-keep_alive; } } --- 703,709 if (virt-keep_alive_timeout == 0) virt-keep_alive_timeout = main_server-keep_alive_timeout; ! if (virt-keep_alive == -1) virt-keep_alive = main_server-keep_alive; } }
cvs commit: apache/src Configuration.tmpl
ben 96/06/29 12:59:26 Modified:src Configuration.tmpl Log: Correct spelling mistake in SOCKSification. Revision ChangesPath 1.20 +1 -1 apache/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v retrieving revision 1.19 retrieving revision 1.20 diff -C3 -r1.19 -r1.20 *** Configuration.tmpl1996/06/27 22:35:41 1.19 --- Configuration.tmpl1996/06/29 19:59:25 1.20 *** *** 51,57 # Apache can be compiled to work over a SOCKS firewall by # adding the following string to your CFLAGS define: # ! # -Dconnect=Rconnect -Dselect=Rselect -Dgethstbyname=Rgethostbyname # # and by adding the following to the EXTRA_LIBS define: # --- 51,57 # Apache can be compiled to work over a SOCKS firewall by # adding the following string to your CFLAGS define: # ! # -Dconnect=Rconnect -Dselect=Rselect -Dgethostbyname=Rgethostbyname # # and by adding the following to the EXTRA_LIBS define: #
cvs commit: apache/src CHANGES conf.h http_bprintf.c
ben 96/06/29 13:02:48 Modified:src CHANGES conf.h http_bprintf.c Log: Bring QNX support up to date. Revision ChangesPath 1.37 +2 -0 apache/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.36 retrieving revision 1.37 diff -C3 -r1.36 -r1.37 *** CHANGES 1996/06/29 19:52:10 1.36 --- CHANGES 1996/06/29 20:02:46 1.37 *** *** 1,3 --- 1,5 + *) Bring QNX support up to date. [Ben Laurie] + *) Make virtual hosts default to main server keepalive parameters. [Alexei Kosut, Ben Laurie] 1.17 +1 -0 apache/src/conf.h Index: conf.h === RCS file: /export/home/cvs/apache/src/conf.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C3 -r1.16 -r1.17 *** conf.h1996/06/26 10:46:36 1.16 --- conf.h1996/06/29 20:02:46 1.17 *** *** 295,300 --- 295,301 #undef NO_KILLPG #undef NO_SETSID #define NEED_INITGROUPS + #define NEED_SELECT_H #define JMP_BUF sigjmp_buf #elif defined(LYNXOS) 1.3 +2 -0 apache/src/http_bprintf.c Index: http_bprintf.c === RCS file: /export/home/cvs/apache/src/http_bprintf.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C3 -r1.2 -r1.3 *** http_bprintf.c1996/05/28 02:55:23 1.2 --- http_bprintf.c1996/06/29 20:02:47 1.3 *** *** 17,23 --- 17,25 #include stdlib.h #include stdarg.h #include string.h + #ifndef QNX #include memory.h + #endif #include assert.h #include math.h #include alloc.h
cvs commit: apache/src CHANGES mod_status.c
ben 96/06/29 15:23:27 Modified:src CHANGES mod_status.c Log: NeXT doesn't have _SC_CLK_TCK... Submitted By: Takaaki Matsumoto [EMAIL PROTECTED] Revision ChangesPath 1.38 +2 -0 apache/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.37 retrieving revision 1.38 diff -C3 -r1.37 -r1.38 *** CHANGES 1996/06/29 20:02:46 1.37 --- CHANGES 1996/06/29 22:23:24 1.38 *** *** 1,3 --- 1,5 + *) Bring NeXT support up to date. [Takaaki Matsumoto] + *) Bring QNX support up to date. [Ben Laurie] *) Make virtual hosts default to main server keepalive parameters. 1.25 +8 -0 apache/src/mod_status.c Index: mod_status.c === RCS file: /export/home/cvs/apache/src/mod_status.c,v retrieving revision 1.24 retrieving revision 1.25 diff -C3 -r1.24 -r1.25 *** mod_status.c 1996/06/11 20:35:36 1.24 --- mod_status.c 1996/06/29 22:23:25 1.25 *** *** 90,95 --- 90,99 #include time.h #include scoreboard.h + #ifdef NEXT + #include machine/param.h + #endif + #define STATUS_MAXLINE 50 #define KBYTE 1024 *** *** 182,188 --- 186,196 unsigned long my_lres,my_bytes,conn_bytes; unsigned short conn_lres; unsigned long bcount=0; + #ifdef NEXT + float tick=HZ; + #else float tick=sysconf(_SC_CLK_TCK); + #endif #endif /* STATUS */ int short_report=0; int no_table_report=0;
cvs commit: apache/src CHANGES http_config.c http_config.h http_main.c httpd.h scoreboard.h
ben 96/07/16 12:39:19
Modified:src CHANGES http_config.c http_config.h http_main.c
httpd.h scoreboard.h
Log:
Graceful restart patches.
Revision ChangesPath
1.42 +5 -0 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.41
retrieving revision 1.42
diff -C3 -r1.41 -r1.42
*** CHANGES 1996/07/10 14:38:04 1.41
--- CHANGES 1996/07/16 19:39:10 1.42
***
*** 1,3
--- 1,8
+ Changes with Apache 1.2b1:
+
+ *) Graceful restart code added. This allows the server to restart without
+ losing current connections on receipt of signal 2 (SIGINT). [Ben
Laurie]
+
Changes with Apache 1.1.1:
*) Fixed bug where Cookie module would make two entries in the
1.14 +42 -1 apache/src/http_config.c
Index: http_config.c
===
RCS file: /export/home/cvs/apache/src/http_config.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C3 -r1.13 -r1.14
*** http_config.c 1996/06/29 19:52:11 1.13
--- http_config.c 1996/07/16 19:39:12 1.14
***
*** 75,80
--- 75,83
#include http_log.h /* for errors in parse_htaccess */
#include http_request.h /* for default_handler (see invoke_handler) */
#include http_conf_globals.h /* Sigh... */
+ #include explain.h
+
+ DEF_Explain
/
*
***
*** 206,211
--- 209,248
return create_empty_config (p);
}
+ #ifdef EXPLAIN
+
+ struct
+ {
+ int offset;
+ char *method;
+ } aMethods[]=
+ {
+ #define m(meth) { XtOffsetOf(module,meth),#meth }
+ m(translate_handler),
+ m(check_user_id),
+ m(auth_checker),
+ m(type_checker),
+ m(fixer_upper),
+ m(logger),
+ { -1,? },
+ #undef m
+ };
+
+ char *ShowMethod(module *modp,int offset)
+ {
+ int n;
+ static char buf[200];
+
+ for(n=0 ; aMethods[n].offset = 0 ; ++n)
+ if(aMethods[n].offset == offset)
+ break;
+ sprintf(buf,%s:%s,modp-name,aMethods[n].method);
+ return buf;
+ }
+ #else
+ #define ShowMethod(modp,offset)
+ #endif
+
/
*
* Dispatch through the modules to find handlers for various phases
***
*** 221,228
handler mod_handler = *(handler *)(offset + (char *)(modp));
if (mod_handler) {
!int result = (*mod_handler)(r);
if (result != DECLINED (!run_all || result != OK))
return result;
}
--- 258,269
handler mod_handler = *(handler *)(offset + (char *)(modp));
if (mod_handler) {
!int result;
!
!Explain1(Run %s,ShowMethod(modp,offset));
!result = (*mod_handler)(r);
+Explain2(%s returned %d,ShowMethod(modp,offset),result);
if (result != DECLINED (!run_all || result != OK))
return result;
}
1.7 +4 -1 apache/src/http_config.h
Index: http_config.h
===
RCS file: /export/home/cvs/apache/src/http_config.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C3 -r1.6 -r1.7
*** http_config.h 1996/05/27 19:48:38 1.6
--- http_config.h 1996/07/16 19:39:12 1.7
***
*** 146,151
--- 146,154
int module_index; /* Index to this modules structures in
* config vectors.
*/
+
+ const char *name;
+
struct module_struct *next;
#ifdef ULTRIX_BRAIN_DEATH
***
*** 198,204
*/
#define MODULE_MAGIC_NUMBER 19960526
! #define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, 0, NULL
/* Generic accessors for other modules to get at their own module-specific
* data
--- 201,207
*/
#define MODULE_MAGIC_NUMBER 19960526
! #define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, 0, __FILE__, NULL
/* Generic accessors for other modules to get at their own module-specific
* data
1.48 +193 -40 apache/src/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache/src/http_main.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -C3 -r1.47 -r1.48
*** http_main.c 1996/07/13 01:47:36 1.47
--- http_main.c 1996/07
cvs commit: apache/src conf.h http_bprintf.c http_main.c
ben 96/07/16 12:57:29
Modified:src conf.h http_bprintf.c http_main.c
Log:
Fix long double warning for IRIX.
Revision ChangesPath
1.19 +2 -1 apache/src/conf.h
Index: conf.h
===
RCS file: /export/home/cvs/apache/src/conf.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C3 -r1.18 -r1.19
*** conf.h1996/07/09 21:40:13 1.18
--- conf.h1996/07/16 19:57:25 1.19
***
*** 93,99
#define USE_FCNTL_SERIALIZED_ACCEPT
#define HAVE_SHMGET
#define HAVE_CRYPT_H
!
#elif defined(HPUX)
#define HAVE_RESOURCE
#undef HAVE_GMTOFF
--- 93,100
#define USE_FCNTL_SERIALIZED_ACCEPT
#define HAVE_SHMGET
#define HAVE_CRYPT_H
! #define NO_LONG_DOUBLE
!
#elif defined(HPUX)
#define HAVE_RESOURCE
#undef HAVE_GMTOFF
1.4 +4 -0 apache/src/http_bprintf.c
Index: http_bprintf.c
===
RCS file: /export/home/cvs/apache/src/http_bprintf.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C3 -r1.3 -r1.4
*** http_bprintf.c1996/06/29 20:02:47 1.3
--- http_bprintf.c1996/07/16 19:57:25 1.4
***
*** 29,35
--- 29,39
#define max(a,b)(a b ? a : b)
#endif
+ #ifdef NO_LONG_DOUBLE
+ #define LONG_DOUBLE double
+ #else
#define LONG_DOUBLE long double
+ #endif
#define FALSE 0
#define TRUE1
1.49 +8 -2 apache/src/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache/src/http_main.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -C3 -r1.48 -r1.49
*** http_main.c 1996/07/16 19:39:13 1.48
--- http_main.c 1996/07/16 19:57:26 1.49
***
*** 107,112
--- 107,116
#include prot.h
#endif
+ #include explain.h
+
+ DEF_Explain
+
/*
* Actual definitions of config globals... here because this is
* for the most part the only code that acts on 'em. (Hmmm... mod_main.c?)
***
*** 839,845
{
long int bs=0;
time_t now;
! short_score new_score_rec=scoreboard_image[child_num];
if (r-sent_bodyct)
bgetopt(r-connection-client, BO_BYTECT, bs);
--- 843,849
{
long int bs=0;
time_t now;
! short_score new_score_rec=scoreboard_image-servers[child_num];
if (r-sent_bodyct)
bgetopt(r-connection-client, BO_BYTECT, bs);
***
*** 861,867
new_score_rec.how_long = now - new_score_rec.last_used;
#if defined(HAVE_MMAP) || defined(HAVE_SHMGET)
! memcpy(scoreboard_image[child_num], new_score_rec,
sizeof(short_score));
#else
lseek (scoreboard_fd, (long)child_num * sizeof(short_score), 0);
force_write (scoreboard_fd, (char*)new_score_rec, sizeof(short_score));
--- 865,871
new_score_rec.how_long = now - new_score_rec.last_used;
#if defined(HAVE_MMAP) || defined(HAVE_SHMGET)
! memcpy(scoreboard_image-servers[child_num], new_score_rec,
sizeof(short_score));
#else
lseek (scoreboard_fd, (long)child_num * sizeof(short_score), 0);
force_write (scoreboard_fd, (char*)new_score_rec, sizeof(short_score));
***
*** 1663,1668
--- 1667,1673
/* Child died... note that it's gone in the scoreboard. */
sync_scoreboard_image();
child_slot = find_child_by_pid (pid);
+ Explain2(Reaping child %d slot %d,pid,child_slot);
if (child_slot = 0)
(void)update_child_status (child_slot, SERVER_DEAD,
(request_rec*)NULL);
***
*** 1672,1677
--- 1677,1683
if ((count_idle_servers() daemons_min_free)
(child_slot = find_free_child_num()) = 0
child_slot = daemons_limit) {
+ Explain1(Starting new child in slot %d,child_slot);
(void)update_child_status(child_slot,SERVER_STARTING,
(request_rec*)NULL);
make_child(server_conf, child_slot);
cvs commit: apache/src http_main.c
ben 96/07/16 15:14:57
Modified:src http_main.c
Log:
Fix warning.
Revision ChangesPath
1.50 +1 -1 apache/src/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache/src/http_main.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -C3 -r1.49 -r1.50
*** http_main.c 1996/07/16 19:57:26 1.49
--- http_main.c 1996/07/16 22:14:54 1.50
***
*** 1461,1467
exit(1);
}
! /*note_cleanups_for_fd (pconf, s); /* arrange to close on exec or
restart */
if((setsockopt(s, SOL_SOCKET,SO_REUSEADDR,(char *)one,sizeof(one)))
== -1) {
--- 1461,1467
exit(1);
}
! /*note_cleanups_for_fd (pconf, s); don't arrange to close on exec
or restart */
if((setsockopt(s, SOL_SOCKET,SO_REUSEADDR,(char *)one,sizeof(one)))
== -1) {
cvs commit: apache/src Configuration.tmpl conf.h rfc1413.c
ben 96/07/16 15:22:11 Modified:src Configuration.tmpl conf.h rfc1413.c Log: HPUX 10 fixes. Revision ChangesPath 1.21 +2 -0 apache/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v retrieving revision 1.20 retrieving revision 1.21 diff -C3 -r1.20 -r1.21 *** Configuration.tmpl1996/06/29 19:59:25 1.20 --- Configuration.tmpl1996/07/16 22:22:08 1.21 *** *** 90,95 --- 90,97 #AUX_LIBS= -lsun # For HP-UX n.b. if you use the paid-for HP CC compiler, use flag -Ae #AUX_CFLAGS= -DHPUX + # For HP-UX 10 + #AUX_CFLAGS= -DHPUX10 # For AIX #AUX_CFLAGS= -DAIX -U__STR__ # For Ultrix 1.20 +3 -1 apache/src/conf.h Index: conf.h === RCS file: /export/home/cvs/apache/src/conf.h,v retrieving revision 1.19 retrieving revision 1.20 diff -C3 -r1.19 -r1.20 *** conf.h1996/07/16 19:57:25 1.19 --- conf.h1996/07/16 22:22:08 1.20 *** *** 95,101 #define HAVE_CRYPT_H #define NO_LONG_DOUBLE ! #elif defined(HPUX) #define HAVE_RESOURCE #undef HAVE_GMTOFF #define NO_KILLPG --- 95,101 #define HAVE_CRYPT_H #define NO_LONG_DOUBLE ! #elif defined(HPUX) || defined(HPUX10) #define HAVE_RESOURCE #undef HAVE_GMTOFF #define NO_KILLPG *** *** 103,109 --- 103,111 #ifndef _HPUX_SOURCE #define _HPUX_SOURCE #endif + #ifndef HPUX10 #define getwd(d) getcwd(d,MAX_STRING_LEN) + #endif #define JMP_BUF sigjmp_buf #define HAVE_MMAP 1.3 +0 -4 apache/src/rfc1413.c Index: rfc1413.c === RCS file: /export/home/cvs/apache/src/rfc1413.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C3 -r1.2 -r1.3 *** rfc1413.c 1996/04/18 11:18:24 1.2 --- rfc1413.c 1996/07/16 22:22:09 1.3 *** *** 77,86 #include http_log.h /* for log_unixerr */ #include rfc1413.h - #ifndef _HPUX_SOURCE - #define _HPUX_SOURCE - #endif - /* System libraries. */ #include setjmp.h --- 77,82
cvs commit: apache/src CHANGES conf.h http_main.c
ben 96/07/17 16:20:52
Modified:src CHANGES conf.h http_main.c
Log:
Work around broken wait() behaviour in Irix (and perhaps others).
Revision ChangesPath
1.44 +4 -0 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.43
retrieving revision 1.44
diff -C3 -r1.43 -r1.44
*** CHANGES 1996/07/17 08:33:40 1.43
--- CHANGES 1996/07/17 23:20:47 1.44
***
*** 6,11
--- 6,15
*) Graceful restart code added. This allows the server to restart without
losing current connections on receipt of signal 2 (SIGINT). [Ben
Laurie]
+ *) Added BROKEN_WAIT flag to conf.h, to be used on systems which fail to
+ reap their children correctly (symptom: mod_status shows children which
+ don't exist). [Ben Laurie]
+
Changes with Apache 1.1.1:
*) Fixed bug where Cookie module would make two entries in the
1.22 +1 -0 apache/src/conf.h
Index: conf.h
===
RCS file: /export/home/cvs/apache/src/conf.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C3 -r1.21 -r1.22
*** conf.h1996/07/17 15:09:58 1.21
--- conf.h1996/07/17 23:20:49 1.22
***
*** 94,99
--- 94,100
#define HAVE_SHMGET
#define HAVE_CRYPT_H
#define NO_LONG_DOUBLE
+ #define BROKEN_WAIT
#elif defined(HPUX) || defined(HPUX10)
#define HAVE_RESOURCE
1.51 +29 -2 apache/src/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache/src/http_main.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -C3 -r1.50 -r1.51
*** http_main.c 1996/07/16 22:14:54 1.50
--- http_main.c 1996/07/17 23:20:50 1.51
***
*** 937,945
#endif
}
int wait_or_timeout (int *status)
{
! wait_or_timeout_retval = -1;
#if defined(NEXT)
if (setjmp(wait_timeout_buf) != 0) {
--- 937,966
#endif
}
+ #ifdef BROKEN_WAIT
+ /*
+ Some systems appear to fail to deliver dead children to wait() at times.
+ This sorts them out.
+ */
+ void reap_children()
+ {
+ int status,n;
+
+ for(n=0 ; n HARD_SERVER_LIMIT ; ++n)
+ if(scoreboard_image-servers[n].status != SERVER_DEAD
+ waitpid(scoreboard_image-servers[n].pid,status,WNOHANG) == -1
+ errno == ECHILD)
+ {
+ sync_scoreboard_image();
+ update_child_status(n,SERVER_DEAD,NULL);
+ }
+ }
+ #endif
+
int wait_or_timeout (int *status)
{
! int wait_or_timeout_retval = -1;
! static int ntimes;
#if defined(NEXT)
if (setjmp(wait_timeout_buf) != 0) {
***
*** 949,955
errno = ETIMEDOUT;
return wait_or_timeout_retval;
}
!
signal (SIGALRM, longjmp_out_of_alarm);
alarm(1);
#if defined(NEXT)
--- 970,982
errno = ETIMEDOUT;
return wait_or_timeout_retval;
}
! #ifdef BROKEN_WAIT
! if(++ntimes == 60)
! {
! reap_children();
! ntimes=0;
! }
! #endif
signal (SIGALRM, longjmp_out_of_alarm);
alarm(1);
#if defined(NEXT)
cvs commit: apache/src http_main.c
ben 96/07/18 11:27:20
Modified:src http_main.c
Log:
Fix compiler warning.
Revision ChangesPath
1.52 +3 -1 apache/src/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache/src/http_main.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -C3 -r1.51 -r1.52
*** http_main.c 1996/07/17 23:20:50 1.51
--- http_main.c 1996/07/18 18:27:16 1.52
***
*** 960,967
int wait_or_timeout (int *status)
{
int wait_or_timeout_retval = -1;
static int ntimes;
!
#if defined(NEXT)
if (setjmp(wait_timeout_buf) != 0) {
#else
--- 960,969
int wait_or_timeout (int *status)
{
int wait_or_timeout_retval = -1;
+ #ifdef BROKEN_WAIT
static int ntimes;
! #endif
!
#if defined(NEXT)
if (setjmp(wait_timeout_buf) != 0) {
#else
cvs commit: apache/src alloc.c alloc.h http_main.c
ben 96/07/21 07:49:04
Modified:src alloc.c alloc.h http_main.c
Log:
Fix old-style restarts (broken by graceful restarts). Also move graceful
restarts to SIGUSR1 instead of SIGINT.
Revision ChangesPath
1.7 +5 -0 apache/src/alloc.c
Index: alloc.c
===
RCS file: /export/home/cvs/apache/src/alloc.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C3 -r1.6 -r1.7
*** alloc.c 1996/06/17 20:43:45 1.6
--- alloc.c 1996/07/21 14:49:01 1.7
***
*** 729,734
--- 729,739
register_cleanup (p, (void *)fd, fd_cleanup, fd_cleanup);
}
+ void kill_cleanups_for_fd(pool *p,int fd)
+ {
+ kill_cleanup(p,(void *)fd,fd_cleanup);
+ }
+
int popenf(struct pool *a, char *name, int flg, int mode)
{
int fd;
1.6 +1 -0 apache/src/alloc.h
Index: alloc.h
===
RCS file: /export/home/cvs/apache/src/alloc.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C3 -r1.5 -r1.6
*** alloc.h 1996/06/09 01:14:35 1.5
--- alloc.h 1996/07/21 14:49:01 1.6
***
*** 205,210
--- 205,211
void note_cleanups_for_file (pool *, FILE *);
void note_cleanups_for_fd (pool *, int);
+ void kill_cleanups_for_fd (pool *p, int fd);
/* routines to note closes... file descriptors are constrained enough
* on some systems that we want to support this.
1.54 +12 -7 apache/src/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache/src/http_main.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -C3 -r1.53 -r1.54
*** http_main.c 1996/07/18 18:44:45 1.53
--- http_main.c 1996/07/21 14:49:01 1.54
***
*** 1154,1160
#ifdef NO_USE_SIGACTION
signal(SIGTERM,(void (*)())sig_term);
signal(SIGHUP,(void (*)())restart);
! signal(SIGINT,(void (*)())graceful_restart);
#else
memset(sa,0,sizeof sa);
sa.sa_handler=(void (*)())sig_term;
--- 1154,1160
#ifdef NO_USE_SIGACTION
signal(SIGTERM,(void (*)())sig_term);
signal(SIGHUP,(void (*)())restart);
! signal(SIGUSR1,(void (*)())graceful_restart);
#else
memset(sa,0,sizeof sa);
sa.sa_handler=(void (*)())sig_term;
***
*** 1164,1171
if(sigaction(SIGHUP,sa,NULL) 0)
log_unixerr(sigaction(SIGHUP), NULL, NULL, server_conf);
sa.sa_handler=(void (*)())graceful_restart;
! if(sigaction(SIGINT,sa,NULL) 0)
! log_unixerr(sigaction(SIGINT), NULL, NULL, server_conf);
#endif
}
--- 1164,1171
if(sigaction(SIGHUP,sa,NULL) 0)
log_unixerr(sigaction(SIGHUP), NULL, NULL, server_conf);
sa.sa_handler=(void (*)())graceful_restart;
! if(sigaction(SIGUSR1,sa,NULL) 0)
! log_unixerr(sigaction(SIGUSR1), NULL, NULL, server_conf);
#endif
}
***
*** 1381,1386
--- 1381,1387
exit(0);
}
/*fprintf(stderr,%d check(2a) %d
%d\n,getpid(),scoreboard_image-global.exit_generation,generation);*/
+ sync_scoreboard_image();
if(scoreboard_image-global.exit_generation = generation)
exit(0);
***
*** 1490,1496
exit(1);
}
! /*note_cleanups_for_fd (pconf, s); don't arrange to close on exec
or restart */
if((setsockopt(s, SOL_SOCKET,SO_REUSEADDR,(char *)one,sizeof(one)))
== -1) {
--- 1491,1497
exit(1);
}
! note_cleanups_for_fd (pconf, s); /* arrange to close on exec or restart
*/
if((setsockopt(s, SOL_SOCKET,SO_REUSEADDR,(char *)one,sizeof(one)))
== -1) {
***
*** 1542,1548
static listen_rec *old_listeners;
! static void copy_listeners()
{
listen_rec *lr;
--- 1543,1549
static listen_rec *old_listeners;
! static void copy_listeners(pool *p)
{
listen_rec *lr;
***
*** 1551,1556
--- 1552,1558
{
listen_rec *nr=malloc(sizeof *nr);
*nr=*lr;
+ kill_cleanups_for_fd(p,nr-fd);
nr-next=old_listeners;
assert(!nr-used);
old_listeners=nr;
***
*** 1621,1633
}
if(is_graceful)
! log_error(SIGINT received. Doing graceful restart,server_conf);
else if (sd != -1 || listenmaxfd != -1) {
reclaim_child_processes(); /* Not when just starting up */
log_error (SIGHUP received. Attempting to restart, server_conf);
}
cvs commit: apache/src/regex regex2.h
ben 96/07/24 06:52:28 Modified:src/regex regex2.h Log: Fix compiler warnings. Revision ChangesPath 1.2 +5 -5 apache/src/regex/regex2.h Index: regex2.h === RCS file: /export/home/cvs/apache/src/regex/regex2.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C3 -r1.1 -r1.2 *** regex2.h 1996/07/23 22:06:46 1.1 --- regex2.h 1996/07/24 13:52:27 1.2 *** *** 61,71 #define OLPAREN (13OPSHIFT) /* (fwd to ) */ #define ORPAREN (14OPSHIFT) /* )back to ( */ #define OCH_(15OPSHIFT) /* begin choice fwd to OOR2 */ ! #define OOR1(16OPSHIFT) /* | pt. 1 back to OOR1 or OCH_ */ ! #define OOR2(17OPSHIFT) /* | pt. 2 fwd to OOR2 or O_CH */ ! #define O_CH(18OPSHIFT) /* end choice back to OOR1 */ ! #define OBOW(19OPSHIFT) /* begin word - */ ! #define OEOW(20OPSHIFT) /* end word - */ /* * Structure for [] character-set representation. Character sets are --- 61,71 #define OLPAREN (13OPSHIFT) /* (fwd to ) */ #define ORPAREN (14OPSHIFT) /* )back to ( */ #define OCH_(15OPSHIFT) /* begin choice fwd to OOR2 */ ! #define OOR1(16uOPSHIFT) /* | pt. 1 back to OOR1 or OCH_ */ ! #define OOR2(17uOPSHIFT) /* | pt. 2 fwd to OOR2 or O_CH */ ! #define O_CH(18uOPSHIFT) /* end choice back to OOR1 */ ! #define OBOW(19uOPSHIFT) /* begin word - */ ! #define OEOW(20uOPSHIFT) /* end word - */ /* * Structure for [] character-set representation. Character sets are
cvs commit: apache/src/regex .cvsignore
ben 96/07/27 05:36:50 Modified:src/regex .cvsignore Log: Ignore executable re produced during make. Revision ChangesPath 1.2 +2 -0 apache/src/regex/.cvsignore Index: .cvsignore === RCS file: /export/home/cvs/apache/src/regex/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C3 -r1.1 -r1.2 *** .cvsignore1996/07/24 19:08:41 1.1 --- .cvsignore1996/07/27 12:36:49 1.2 *** *** 1 --- 1,3 *.ih + re +
cvs commit: apache/src conf.h http_config.c http_config.h http_core.c http_core.h
ben 96/07/27 06:08:31
Modified:src conf.h http_config.c http_config.h http_core.c
http_core.h
Log:
Major rehash of setrlimit stuff, for two reasons, first, to make it compile,
and second, to remove much redundant code.
Revision ChangesPath
1.26 +1 -0 apache/src/conf.h
Index: conf.h
===
RCS file: /export/home/cvs/apache/src/conf.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -C3 -r1.25 -r1.26
*** conf.h1996/07/25 19:49:03 1.25
--- conf.h1996/07/27 13:08:27 1.26
***
*** 217,222
--- 217,223
#define HAVE_SYS_SELECT_H
#define USE_FCNTL_SERIALIZED_ACCEPT
#define HAVE_MMAP
+ #define NEED_SYS_RESOURCE_H
#define SecureWare
/* Although SCO 5 defines these in strings.h (note the s) they don't
have
1.15 +1 -0 apache/src/http_config.c
Index: http_config.c
===
RCS file: /export/home/cvs/apache/src/http_config.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C3 -r1.14 -r1.15
*** http_config.c 1996/07/16 19:39:12 1.14
--- http_config.c 1996/07/27 13:08:28 1.15
***
*** 395,400
--- 395,401
return pstrcat (parms-pool, cmd-name, not allowed here, NULL);
parms-info = cmd-cmd_data;
+ parms-cmd = cmd;
switch (cmd-args_how) {
case RAW_ARGS:
1.8 +1 -0 apache/src/http_config.h
Index: http_config.h
===
RCS file: /export/home/cvs/apache/src/http_config.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C3 -r1.7 -r1.8
*** http_config.h 1996/07/16 19:39:12 1.7
--- http_config.h 1996/07/27 13:08:28 1.8
***
*** 123,128
--- 123,129
char *path; /* If configuring for a directory,
* pathname of that directory.
*/
+ command_rec *cmd; /* configuration command */
} cmd_parms;
/* This structure records the existence of handlers in a module... */
1.21 +50 -83apache/src/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apache/src/http_core.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C3 -r1.20 -r1.21
*** http_core.c 1996/07/27 02:49:34 1.20
--- http_core.c 1996/07/27 13:08:29 1.21
***
*** 839,859
return NULL;
}
! char *set_limit_cpu (cmd_parms *cmd, core_dir_config *conf, char *arg)
{
- #ifdef RLIMIT_CPU
char *str;
! quad_t cur = 0;
! quad_t max = 0;
if ((str = getword_conf(cmd-pool, arg)))
if (!strcasecmp(str, max))
! cur = conf-limit_cpu-rlim_max;
else
cur = atol(str);
else {
! log_error(Invalid parameters for RLimitCPU, cmd-server);
! return NULL;
}
if ((str = getword_conf(cmd-pool, arg)))
--- 839,859
return NULL;
}
! static void set_rlimit(cmd_parms *cmd, struct rlimit *limit, char *arg)
{
char *str;
! /* If your platform doesn't define rlim_t then typedef it in conf.h */
! rlim_t cur = 0;
! rlim_t max = 0;
if ((str = getword_conf(cmd-pool, arg)))
if (!strcasecmp(str, max))
! cur = limit-rlim_max;
else
cur = atol(str);
else {
! log_printf(cmd-server, Invalid parameters for %s, cmd-cmd-name);
! return;
}
if ((str = getword_conf(cmd-pool, arg)))
***
*** 861,957
/* if we aren't running as root, cannot increase max */
if (geteuid()) {
! conf-limit_cpu-rlim_cur = cur;
if (max)
! log_error(Must be uid 0 to raise maximum RLIMIT_CPU, cmd-server);
}
else {
if (cur)
! conf-limit_cpu-rlim_cur = cur;
if (max)
! conf-limit_cpu-rlim_max = max;
}
- #else
- log_error(RLimitCPU not supported on this platform, cmd-server);
- #endif
- return NULL;
}
! char *set_limit_mem (cmd_parms *cmd, core_dir_config *conf, char *arg)
{
! #if defined (RLIMIT_DATA) || defined (RLIMIT_VMEM)
! char *str;
! quad_t cur = 0;
! quad_t max = 0;
!
! if ((str = getword_conf(cmd-pool, arg)))
! if (!strcasecmp(str, max))
! cur = conf-limit_mem-rlim_max;
! else
! cur = atol(str);
! else {
! log_error(Invalid parameters for RLimitMEM, cmd-server);
! return NULL;
! }
cvs commit: apache/src http_core.c
ben 96/07/27 06:25:06
Modified:src http_core.c
Log:
Makes setrlimit stuff burn less memory, and also tidies it up some more.
Revision ChangesPath
1.22 +23 -19apache/src/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apache/src/http_core.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C3 -r1.21 -r1.22
*** http_core.c 1996/07/27 13:08:29 1.21
--- http_core.c 1996/07/27 13:25:05 1.22
***
*** 95,118
conf-do_rfc1413 = DEFAULT_RFC1413 | 2; /* set bit 1 to indicate
default */
#ifdef RLIMIT_CPU
! conf-limit_cpu = (struct rlimit *) pcalloc (a, sizeof (struct rlimit));
! if ((getrlimit(RLIMIT_CPU, conf-limit_cpu)) != 0)
! conf-limit_cpu = NULL;
#endif
! #ifdef RLIMIT_DATA
! conf-limit_mem = (struct rlimit *) pcalloc (a, sizeof (struct rlimit));
! if ((getrlimit(RLIMIT_DATA, conf-limit_mem)) != 0)
! conf-limit_mem = NULL;
! #endif
! #ifdef RLIMIT_VMEM
! conf-limit_mem = (struct rlimit *) pcalloc (a, sizeof (struct rlimit));
! if ((getrlimit(RLIMIT_VMEM, conf-limit_mem)) != 0)
! conf-limit_mem = NULL;
#endif
#ifdef RLIMIT_NPROC
! conf-limit_nproc = (struct rlimit *) pcalloc (a, sizeof (struct
rlimit));
! if ((getrlimit(RLIMIT_NPROC, conf-limit_nproc)) != 0)
! conf-limit_nproc = NULL;
#endif
conf-sec = make_array (a, 2, sizeof(void *));
--- 95,107
conf-do_rfc1413 = DEFAULT_RFC1413 | 2; /* set bit 1 to indicate
default */
#ifdef RLIMIT_CPU
! conf-limit_cpu = NULL;
#endif
! #if defined(RLIMIT_DATA) || defined(RLIMIT_VMEM)
! conf-limit_mem = NULL;
#endif
#ifdef RLIMIT_NPROC
! conf-limit_nproc = NULL;
#endif
conf-sec = make_array (a, 2, sizeof(void *));
***
*** 839,851
return NULL;
}
! static void set_rlimit(cmd_parms *cmd, struct rlimit *limit, char *arg)
{
char *str;
/* If your platform doesn't define rlim_t then typedef it in conf.h */
rlim_t cur = 0;
rlim_t max = 0;
if ((str = getword_conf(cmd-pool, arg)))
if (!strcasecmp(str, max))
cur = limit-rlim_max;
--- 828,851
return NULL;
}
! static void set_rlimit(cmd_parms *cmd, struct rlimit **plimit, char *arg,
!int type)
{
char *str;
+ struct rlimit *limit;
/* If your platform doesn't define rlim_t then typedef it in conf.h */
rlim_t cur = 0;
rlim_t max = 0;
+ *plimit=(struct rlimit *)pcalloc(cmd-pool,sizeof **plimit);
+ limit=*plimit;
+ if ((getrlimit(type, limit)) != 0)
+ {
+ *plimit = NULL;
+ log_unixerr(getrlimit,cmd-cmd-name,failed,cmd-server);
+ return;
+ }
+
if ((str = getword_conf(cmd-pool, arg)))
if (!strcasecmp(str, max))
cur = limit-rlim_max;
***
*** 884,890
#ifdef RLIMIT_CPU
char *set_limit_cpu (cmd_parms *cmd, core_dir_config *conf, char *arg)
{
! set_rlimit(cmd,conf-limit_cpu,arg);
return NULL;
}
#endif
--- 884,890
#ifdef RLIMIT_CPU
char *set_limit_cpu (cmd_parms *cmd, core_dir_config *conf, char *arg)
{
! set_rlimit(cmd,conf-limit_cpu,arg,RLIMIT_CPU);
return NULL;
}
#endif
***
*** 892,898
#if defined (RLIMIT_DATA) || defined (RLIMIT_VMEM)
char *set_limit_mem (cmd_parms *cmd, core_dir_config *conf, char *arg)
{
! set_rlimit(cmd,conf-limit_mem,arg);
return NULL;
}
#endif
--- 892,902
#if defined (RLIMIT_DATA) || defined (RLIMIT_VMEM)
char *set_limit_mem (cmd_parms *cmd, core_dir_config *conf, char *arg)
{
! #ifdef RLIMIT_DATA
! set_rlimit(cmd,conf-limit_mem,arg,RLIMIT_DATA);
! #else
! set_rlimit(cmd,conf-limit_mem,arg,RLIMIT_VMEM);
! #endif
return NULL;
}
#endif
***
*** 900,906
#ifdef RLIMIT_NPROC
char *set_limit_nproc (cmd_parms *cmd, core_dir_config *conf, char *arg)
{
! set_rlimit(cmd,conf-limit_nproc,arg);
return NULL;
}
#endif
--- 904,910
#ifdef RLIMIT_NPROC
char *set_limit_nproc (cmd_parms *cmd, core_dir_config *conf, char *arg)
{
! set_rlimit(cmd,conf-limit_nproc,arg,RLIMIT_NPROC);
return NULL;
}
#endif
cvs commit: apache/src http_config.c
ben 96/07/27 10:18:26 Modified:src http_config.c Log: Use stderr instead of creating a new FILE *, mainly to avoid bugs on some OSes, but also because it is cleaner. Revision ChangesPath 1.17 +1 -1 apache/src/http_config.c Index: http_config.c === RCS file: /export/home/cvs/apache/src/http_config.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C3 -r1.16 -r1.17 *** http_config.c 1996/07/27 16:59:43 1.16 --- http_config.c 1996/07/27 17:18:25 1.17 *** *** 782,788 s-server_admin = DEFAULT_ADMIN; s-server_hostname = NULL; s-error_fname = DEFAULT_ERRORLOG; ! s-error_log = fdopen(STDERR_FILENO, w); s-srm_confname = RESOURCE_CONFIG_FILE; s-access_confname = ACCESS_CONFIG_FILE; s-timeout = DEFAULT_TIMEOUT; --- 782,788 s-server_admin = DEFAULT_ADMIN; s-server_hostname = NULL; s-error_fname = DEFAULT_ERRORLOG; ! s-error_log = stderr; s-srm_confname = RESOURCE_CONFIG_FILE; s-access_confname = ACCESS_CONFIG_FILE; s-timeout = DEFAULT_TIMEOUT;
cvs commit: apache/src/regex Makefile
ben 96/07/28 03:32:19 Modified:src Configuration.tmpl Makefile.tmpl src/regex Makefile Log: Make ranlib work, when it doesn't (as it were). Clean up regex inheritance of Apache flags. Revision ChangesPath 1.22 +6 -0 apache/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v retrieving revision 1.21 retrieving revision 1.22 diff -C3 -r1.21 -r1.22 *** Configuration.tmpl1996/07/16 22:22:08 1.21 --- Configuration.tmpl1996/07/28 10:32:17 1.22 *** *** 75,80 --- 75,85 # -lndbm is commonly required for DBM auth, if that is configured in. EXTRA_LIBS= + # Default to using ranlib on libraries (for regex). Set this to something else + # if ranlib kills your system (usually by setting it again in the OS specific + # section below) + RANLIB=ranlib + # AUX_CFLAGS are system-specific control flags. # NOTE: IF YOU DO NOT CHOOSE ONE OF THESE, EDIT httpd.h AND CHOOSE # SETTINGS FOR THE SYSTEM FLAGS. IF YOU DON'T, BAD THINGS WILL HAPPEN. *** *** 120,125 --- 125,131 #AUX_CFLAGS= -DSCO5 #AUX_LIBS=-lsocket -lmalloc -lprot #BROKEN_BPRINTF_FLAGS=-K noinline + #RANLIB=true # For SVR4 # Some SVR4 implementations will require SO_LINGER option to be set in order # to guarantee buffer flushes. Dell, Esix, and UnixWare are a few of these. 1.17 +1 -1 apache/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache/src/Makefile.tmpl,v retrieving revision 1.16 retrieving revision 1.17 diff -C3 -r1.16 -r1.17 *** Makefile.tmpl 1996/07/27 23:00:49 1.16 --- Makefile.tmpl 1996/07/28 10:32:17 1.17 *** *** 25,31 $(CC) $(LFLAGS) $(AUX_LFLAGS) -o httpd $(OBJS) $(LIBS) $(EXTRA_LIBS) $(AUX_LIBS) regex/libregex.a: ! cd regex; make lib CC=$(CC) CFLAGS=$(CFLAGS) $(AUX_CFLAGS) -I. -DPOSIX_MISTAKE clean: rm -f httpd $(OBJS) *pure* --- 25,31 $(CC) $(LFLAGS) $(AUX_LFLAGS) -o httpd $(OBJS) $(LIBS) $(EXTRA_LIBS) $(AUX_LIBS) regex/libregex.a: ! cd regex; make lib CC=$(CC) AUX_CFLAGS=$(CFLAGS) $(AUX_CFLAGS) RANLIB=$(RANLIB) clean: rm -f httpd $(OBJS) *pure* 1.4 +2 -2 apache/src/regex/Makefile Index: Makefile === RCS file: /export/home/cvs/apache/src/regex/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C3 -r1.3 -r1.4 *** Makefile 1996/07/27 04:25:42 1.3 --- Makefile 1996/07/28 10:32:19 1.4 *** *** 6,12 # Put -Dconst= in for a pre-ANSI compiler. # Do not take -DPOSIX_MISTAKE out. # REGCFLAGS isn't important to you (it's for my use in some special contexts). ! CFLAGS=-I. -DPOSIX_MISTAKE # If you have a pre-ANSI compiler, put -o into MKHFLAGS. If you want # the Berkeley __P macro, put -b in. --- 6,12 # Put -Dconst= in for a pre-ANSI compiler. # Do not take -DPOSIX_MISTAKE out. # REGCFLAGS isn't important to you (it's for my use in some special contexts). ! CFLAGS=-I. -DPOSIX_MISTAKE $(AUX_CFLAGS) # If you have a pre-ANSI compiler, put -o into MKHFLAGS. If you want # the Berkeley __P macro, put -b in. *** *** 40,46 lib:purge $(OBJPRODN) rm -f libregex.a ar crv libregex.a $(OBJPRODN) ! ranlib libregex.a purge: rm -f *.o --- 40,46 lib:purge $(OBJPRODN) rm -f libregex.a ar crv libregex.a $(OBJPRODN) ! $(RANLIB) libregex.a purge: rm -f *.o
cvs commit: apache/src util_script.c
ben 96/08/06 11:30:40
Modified:src util_script.c
Log:
Undo accidental change...
Revision ChangesPath
1.18 +1 -1 apache/src/util_script.c
Index: util_script.c
===
RCS file: /export/home/cvs/apache/src/util_script.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C3 -r1.17 -r1.18
*** util_script.c 1996/08/06 18:28:41 1.17
--- util_script.c 1996/08/06 18:30:38 1.18
***
*** 89,95
for(x=1;xn;x++) {
w = getword_nulls(p, args, '+');
unescape_url(w);
! /*av[x] = escape_shell_cmd(p, w);*/
av[x] = w;
}
av[n] = NULL;
--- 89,95
for(x=1;xn;x++) {
w = getword_nulls(p, args, '+');
unescape_url(w);
! av[x] = escape_shell_cmd(p, w);
av[x] = w;
}
av[n] = NULL;
cvs commit: apache/src Configure
ben 96/08/17 07:18:22 Modified:src Configure Log: Add -lcrypt to BSD486. Revision ChangesPath 1.10 +1 -0 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.9 retrieving revision 1.10 diff -C3 -r1.9 -r1.10 *** Configure 1996/08/06 18:28:40 1.9 --- Configure 1996/08/17 14:18:20 1.10 *** *** 173,178 --- 173,179 ;; BSD486) OS='FreeBSD/NETBSD on 486' + LIBS=$LIBS -lcrypt ;; NeXT) OS='NeXT'
cvs commit: apache/src http_main.c
ben 96/08/19 11:44:17
Modified:src http_main.c
Log:
Add directive listing option.
Revision ChangesPath
1.61 +22 -2 apache/src/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache/src/http_main.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -C3 -r1.60 -r1.61
*** http_main.c 1996/08/19 18:32:58 1.60
--- http_main.c 1996/08/19 18:44:16 1.61
***
*** 340,348
void usage(char *bin)
{
! fprintf(stderr,Usage: %s [-d directory] [-f file] [-v]\n,bin);
fprintf(stderr,-d directory : specify an alternate initial
ServerRoot\n);
fprintf(stderr,-f file : specify an alternate ServerConfigFile\n);
exit(1);
}
--- 340,350
void usage(char *bin)
{
! fprintf(stderr,Usage: %s [-d directory] [-f file] [-v] [-h]\n,bin);
fprintf(stderr,-d directory : specify an alternate initial
ServerRoot\n);
fprintf(stderr,-f file : specify an alternate ServerConfigFile\n);
+ fprintf(stderr,-v : show version number\n);
+ fprintf(stderr,-h : list directives\n);
exit(1);
}
***
*** 1811,1816
--- 1813,1833
} /* standalone_main */
+ void show_directives()
+ {
+ extern module *prelinked_modules[];
+ extern char *module_names[];
+ command_rec *pc;
+ int n;
+ int t;
+
+ for(t=0 ; prelinked_modules[t] ; ++t)
+ ;
+ for(n=0 ; prelinked_modules[n] ; ++n)
+ for(pc=prelinked_modules[n]-cmds ; pc pc-name ; ++pc)
+ printf(%s\t%s\t%s\n,pc-name,pc-errmsg,module_names[t-n-1]);
+ }
+
extern char *optarg;
extern int optind;
***
*** 1841,1847
strcpy (server_root, HTTPD_ROOT);
strcpy (server_confname, SERVER_CONFIG_FILE);
! while((c = getopt(argc,argv,Xd:f:v)) != -1) {
switch(c) {
case 'd':
strcpy (server_root, optarg);
--- 1858,1864
strcpy (server_root, HTTPD_ROOT);
strcpy (server_confname, SERVER_CONFIG_FILE);
! while((c = getopt(argc,argv,Xd:f:vh)) != -1) {
switch(c) {
case 'd':
strcpy (server_root, optarg);
***
*** 1852,1857
--- 1869,1877
case 'v':
printf(Server version %s.\n,SERVER_VERSION);
exit(1);
+ case 'h':
+ show_directives();
+ exit(1);
case 'X':
++one_process; /* Weird debugging mode. */
break;
cvs commit: apache/src CHANGES
ben 96/08/19 13:59:22 Modified:src CHANGES Log: Document -h flag. Revision ChangesPath 1.52 +5 -1 apache/src/CHANGES
cvs commit: apache/src util.c
ben 96/08/19 15:58:33
Modified:src util.c
Log:
Remove strange unused code of unknown provenance.
Revision ChangesPath
1.17 +0 -38 apache/src/util.c
Index: util.c
===
RCS file: /export/home/cvs/apache/src/util.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C3 -r1.16 -r1.17
*** util.c1996/08/19 17:54:52 1.16
--- util.c1996/08/19 22:58:28 1.17
***
*** 66,109
#include time.h
#endif
- #ifdef NOTDEF
- extern char** environ;
-
- /* taken from bdflush-1.5 for Linux source code */
- void inststr(char *dst[], int argc, char *src)
- {
- if (strlen(src) = strlen(dst[0]))
- {
- char *ptr;
-
- for (ptr = dst[0]; *ptr; *(ptr++) = '\0');
-
- strcpy(dst[0], src);
- } else
- {
- /* stolen from the source to perl 4.036 (assigning to $0) */
- char *ptr, *ptr2;
- int count;
- ptr = dst[0] + strlen(dst[0]);
- for (count = 1; count argc; count++) {
- if (dst[count] == ptr + 1)
- ptr += strlen(++ptr);
- }
- if (environ[0] == ptr + 1) {
- for (count = 0; environ[count]; count++)
- if (environ[count] == ptr + 1)
- ptr += strlen(++ptr);
- }
- count = 0;
- for (ptr2 = dst[0]; ptr2 = ptr; ptr2++) {
- *ptr2 = '\0';
- count++;
- }
- strncpy(dst[0], src, count);
- }
- }
- #endif
-
char *get_time() {
time_t t;
char *time_string;
--- 66,71
cvs commit: CVSROOT log_accum.pl
ben 96/08/24 04:17:12
Modified:. log_accum.pl
Log:
Try to diagnose missing change entries in email.
Revision ChangesPath
1.20 +3 -2 CVSROOT/log_accum.pl
Index: log_accum.pl
===
RCS file: /export/home/cvs/CVSROOT/log_accum.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -C3 -r1.19 -r1.20
*** log_accum.pl 1996/03/14 19:01:46 1.19
--- log_accum.pl 1996/08/24 11:17:08 1.20
***
*** 1,6
#!/usr/bin/perl
#
! # $Id: log_accum.pl,v 1.19 1996/03/14 19:01:46 ben Exp $
#
# Perl filter to handle the log messages from the checkin of files in
# a directory. This script will group the lists of files by log
--- 1,6
#!/usr/bin/perl
#
! # $Id: log_accum.pl,v 1.20 1996/08/24 11:17:08 ben Exp $
#
# Perl filter to handle the log messages from the checkin of files in
# a directory. This script will group the lists of files by log
***
*** 220,226
$prev_rev =~ /(.*)\.([0-9]+$)/;
$prev = $2 - 1;
$prev_rev = $1 . . . $prev;
! #print STDERR Rev: $rev, $1, $2, $prev, $prev_rev\n;
open(DIFF, -|) || exec 'cvs', '-Qn', 'diff', '-C3', -r$prev_rev,
$file;
while (DIFF) {
$diff .= $_;
--- 220,227
$prev_rev =~ /(.*)\.([0-9]+$)/;
$prev = $2 - 1;
$prev_rev = $1 . . . $prev;
! print STDERR Rev: $rev, $1, $2, $prev, $prev_rev\n;
! print STDERR Dir: `pwd`\n;
open(DIFF, -|) || exec 'cvs', '-Qn', 'diff', '-C3', -r$prev_rev,
$file;
while (DIFF) {
$diff .= $_;
cvs commit: apache/src CHANGES
ben 96/08/24 04:19:39 Modified:src CHANGES Log: Test. Revision ChangesPath 1.56 +3 -1 apache/src/CHANGES
cvs commit: CVSROOT log_accum.pl
ben 96/08/24 04:21:25
Modified:. log_accum.pl
Log:
Debug.
Revision ChangesPath
1.21 +3 -2 CVSROOT/log_accum.pl
Index: log_accum.pl
===
RCS file: /export/home/cvs/CVSROOT/log_accum.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -C3 -r1.20 -r1.21
*** log_accum.pl 1996/08/24 11:17:08 1.20
--- log_accum.pl 1996/08/24 11:21:24 1.21
***
*** 1,6
#!/usr/bin/perl
#
! # $Id: log_accum.pl,v 1.20 1996/08/24 11:17:08 ben Exp $
#
# Perl filter to handle the log messages from the checkin of files in
# a directory. This script will group the lists of files by log
--- 1,6
#!/usr/bin/perl
#
! # $Id: log_accum.pl,v 1.21 1996/08/24 11:21:24 ben Exp $
#
# Perl filter to handle the log messages from the checkin of files in
# a directory. This script will group the lists of files by log
***
*** 221,227
$prev = $2 - 1;
$prev_rev = $1 . . . $prev;
print STDERR Rev: $rev, $1, $2, $prev, $prev_rev\n;
! print STDERR Dir: `pwd`\n;
open(DIFF, -|) || exec 'cvs', '-Qn', 'diff', '-C3', -r$prev_rev,
$file;
while (DIFF) {
$diff .= $_;
--- 221,228
$prev = $2 - 1;
$prev_rev = $1 . . . $prev;
print STDERR Rev: $rev, $1, $2, $prev, $prev_rev\n;
! $xxx=`pwd`;
! print STDERR Dir: $xxx\n;
open(DIFF, -|) || exec 'cvs', '-Qn', 'diff', '-C3', -r$prev_rev,
$file;
while (DIFF) {
$diff .= $_;
cvs commit: apache/src http_protocol.c
ben 96/08/24 08:48:22
Modified:src http_protocol.c
Log:
check_hostalias obliterated the server port number. Fixed.
Revision ChangesPath
1.43 +3 -2 apache/src/http_protocol.c
Index: http_protocol.c
===
RCS file: /export/home/cvs/apache/src/http_protocol.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -C3 -r1.42 -r1.43
*** http_protocol.c 1996/08/20 11:50:50 1.42
--- http_protocol.c 1996/08/24 15:48:21 1.43
***
*** 50,56
*
*/
! /* $Id: http_protocol.c,v 1.42 1996/08/20 11:50:50 paul Exp $ */
/*
* http_protocol.c --- routines which directly communicate with the
--- 50,56
*
*/
! /* $Id: http_protocol.c,v 1.43 1996/08/24 15:48:21 ben Exp $ */
/*
* http_protocol.c --- routines which directly communicate with the
***
*** 573,578
--- 573,579
}
void check_hostalias (request_rec *r) {
+ char *savehost=r-hostname;
char *host = getword(r-pool, r-hostname, ':'); /* Get rid of port */
int port = (*r-hostname) ? atoi(r-hostname) : 80;
server_rec *s;
***
*** 586,592
host[l] = '\0';
}
! r-hostname = host;
for (s = r-server-next; s; s = s-next) {
char *names = s-names;
--- 587,593
host[l] = '\0';
}
! r-hostname = savehost;
for (s = r-server-next; s; s = s-next) {
char *names = s-names;
cvs commit: apache/src http_protocol.c
ben 96/08/24 09:04:55
Modified:src http_protocol.c
Log:
Undo last change, it was misguided. But make check_hostalias static since it
only really works once.
Revision ChangesPath
1.44 +3 -4 apache/src/http_protocol.c
Index: http_protocol.c
===
RCS file: /export/home/cvs/apache/src/http_protocol.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -C3 -r1.43 -r1.44
*** http_protocol.c 1996/08/24 15:48:21 1.43
--- http_protocol.c 1996/08/24 16:04:54 1.44
***
*** 50,56
*
*/
! /* $Id: http_protocol.c,v 1.43 1996/08/24 15:48:21 ben Exp $ */
/*
* http_protocol.c --- routines which directly communicate with the
--- 50,56
*
*/
! /* $Id: http_protocol.c,v 1.44 1996/08/24 16:04:54 ben Exp $ */
/*
* http_protocol.c --- routines which directly communicate with the
***
*** 572,579
}
}
! void check_hostalias (request_rec *r) {
! char *savehost=r-hostname;
char *host = getword(r-pool, r-hostname, ':'); /* Get rid of port */
int port = (*r-hostname) ? atoi(r-hostname) : 80;
server_rec *s;
--- 572,578
}
}
! static void check_hostalias (request_rec *r) {
char *host = getword(r-pool, r-hostname, ':'); /* Get rid of port */
int port = (*r-hostname) ? atoi(r-hostname) : 80;
server_rec *s;
***
*** 587,593
host[l] = '\0';
}
! r-hostname = savehost;
for (s = r-server-next; s; s = s-next) {
char *names = s-names;
--- 586,592
host[l] = '\0';
}
! r-hostname = host;
for (s = r-server-next; s; s = s-next) {
char *names = s-names;
cvs commit: apache/src Makefile.tmpl
ben 96/09/08 05:19:10 Modified:src Makefile.tmpl Log: Restore missing space. Revision ChangesPath 1.24 +2 -2 apache/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache/src/Makefile.tmpl,v retrieving revision 1.23 retrieving revision 1.24 diff -C3 -r1.23 -r1.24 *** Makefile.tmpl 1996/08/20 11:50:35 1.23 --- Makefile.tmpl 1996/09/08 12:19:09 1.24 *** *** 1,4 ! # $Id: Makefile.tmpl,v 1.23 1996/08/20 11:50:35 paul Exp $ # Apache makefile template (well, suffix). # This is combined with the information in the Configuration file --- 1,4 ! # $Id: Makefile.tmpl,v 1.24 1996/09/08 12:19:09 ben Exp $ # Apache makefile template (well, suffix). # This is combined with the information in the Configuration file *** *** 44,50 # Work around broken compilers http_bprintf.o: http_bprintf.c ! $(CC) -c $(INCLUDES) $(CFLAGS)$(BROKEN_BPRINTF_FLAGS) http_bprintf.c #Dependencies #Core code --- 44,50 # Work around broken compilers http_bprintf.o: http_bprintf.c ! $(CC) -c $(INCLUDES) $(CFLAGS) $(BROKEN_BPRINTF_FLAGS) http_bprintf.c #Dependencies #Core code
cvs commit: apache/src mod_cookies.c
ben 96/09/08 05:25:31
Modified:src mod_cookies.c
Log:
Use strchr instead of index.
Revision ChangesPath
1.15 +2 -2 apache/src/mod_cookies.c
Index: mod_cookies.c
===
RCS file: /export/home/cvs/apache/src/mod_cookies.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C3 -r1.14 -r1.15
*** mod_cookies.c 1996/08/24 14:41:32 1.14
--- mod_cookies.c 1996/09/08 12:25:30 1.15
***
*** 50,56
*
*/
! /* $Id: mod_cookies.c,v 1.14 1996/08/24 14:41:32 ben Exp $ */
/* User Tracking Module
*
--- 50,56
*
*/
! /* $Id: mod_cookies.c,v 1.15 1996/09/08 12:25:30 ben Exp $ */
/* User Tracking Module
*
***
*** 257,263
/* {num type}* */
while ( word[0] ) {
/* num */
! if ( index(0123456789, word[0]) != NULL )
num = atoi( word );
else
return bad expires code, numeric value expected.;
--- 257,263
/* {num type}* */
while ( word[0] ) {
/* num */
! if ( strchr(0123456789, word[0]) != NULL )
num = atoi( word );
else
return bad expires code, numeric value expected.;
cvs commit: apache/src Configuration.tmpl
ben 96/09/08 06:55:09 Modified:src Configuration.tmpl Log: Whoops. Missed out a small comment. Revision ChangesPath 1.34 +5 -3 apache/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v retrieving revision 1.33 retrieving revision 1.34 diff -C3 -r1.33 -r1.34 *** Configuration.tmpl1996/09/08 13:52:39 1.33 --- Configuration.tmpl1996/09/08 13:55:08 1.34 *** *** 1,4 ! # $Id: Configuration.tmpl,v 1.33 1996/09/08 13:52:39 ben Exp $ # Config file for the Apache httpd. # Configuration.tmpl is the template for Configuration. Configuration should --- 1,4 ! # $Id: Configuration.tmpl,v 1.34 1996/09/08 13:55:08 ben Exp $ # Config file for the Apache httpd. # Configuration.tmpl is the template for Configuration. Configuration should *** *** 84,97 # If you find that your OS can't cope with mmap (compiles OKAY but refuses # to run and moans httpd: Could not mmap memory .. or similar) set # this to 'yes'. ! # ! # Rule STATUS=yes Rule SOCKS=no # The following rules should be set automatically by Configure. However, if # they are not set by Configure (because we don't know the correct value for ! # your platform) you may override them here. Rule HSREGEX=default Rule BADMMAP=default --- 84,99 # If you find that your OS can't cope with mmap (compiles OKAY but refuses # to run and moans httpd: Could not mmap memory .. or similar) set # this to 'yes'. ! Rule STATUS=yes Rule SOCKS=no # The following rules should be set automatically by Configure. However, if # they are not set by Configure (because we don't know the correct value for ! # your platform), or are set incorrectly, you may override them here. ! # If you have to do this, please let us know what you set and what your ! # platform is, by sending mail to [EMAIL PROTECTED] ! Rule HSREGEX=default Rule BADMMAP=default
cvs commit: apache/src http_main.c
ben 96/09/23 02:53:34
Modified:src http_main.c
Log:
Add more interesting stuff to the -h option.
Revision ChangesPath
1.69 +33 -2 apache/src/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache/src/http_main.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -C3 -r1.68 -r1.69
*** http_main.c 1996/09/17 14:53:52 1.68
--- http_main.c 1996/09/23 09:53:32 1.69
***
*** 50,56
*
*/
! /* $Id: http_main.c,v 1.68 1996/09/17 14:53:52 chuck Exp $ */
/*
* httpd.c: simple http daemon for answering WWW file requests
--- 50,56
*
*/
! /* $Id: http_main.c,v 1.69 1996/09/23 09:53:32 ben Exp $ */
/*
* httpd.c: simple http daemon for answering WWW file requests
***
*** 1839,1844
--- 1839,1871
} /* standalone_main */
+ void show_overrides(command_rec *pc,module *pm)
+ {
+ int n;
+ struct
+ {
+ int override;
+ char letter;
+ } aOvers[]= {
+ { OR_LIMIT, 'L' },
+ { OR_OPTIONS, 'O' },
+ { OR_FILEINFO, 'F' },
+ { OR_AUTHCFG, 'A' },
+ { OR_INDEXES, 'I' },
+ { ACCESS_CONF, 'a' },
+ { RSRC_CONF, 'r' },
+ { (OR_ALL|RSRC_CONF)~(OR_LIMIT|OR_AUTHCFG), 'd' }, /* outside
Directory */
+ { OR_ALL|ACCESS_CONF, 'D' }, /* inside Directory */
+ { 0, '\0' }
+ };
+
+ for(n=0 ; aOvers[n].override ; ++n)
+ if(pc-req_overrideaOvers[n].override)
+ putchar(aOvers[n].letter);
+ if((pc-req_override(OR_ALL|ACCESS_CONF)) !pm-create_dir_config)
+ putchar('!'); /* Directive allowed inside Directory but module
doesn't support per-dir config */
+ }
+
void show_directives()
{
extern module *prelinked_modules[];
***
*** 1851,1857
;
for(n=0 ; prelinked_modules[n] ; ++n)
for(pc=prelinked_modules[n]-cmds ; pc pc-name ; ++pc)
! printf(%s\t%s\t%s\n,pc-name,pc-errmsg,module_names[t-n-1]);
}
extern char *optarg;
--- 1878,1888
;
for(n=0 ; prelinked_modules[n] ; ++n)
for(pc=prelinked_modules[n]-cmds ; pc pc-name ; ++pc)
! {
! printf(%s\t%s\t%s\t,pc-name,pc-errmsg,module_names[t-n-1]);
! show_overrides(pc,prelinked_modules[n]);
! putchar('\n');
! }
}
extern char *optarg;
cvs commit: apache/src http_request.c
ben 96/10/16 10:29:23 Modified:src http_request.c Log: Add missing location_walk()s. Reviewed by: Alexei Kosut Revision ChangesPath 1.17 +3 -1 apache/src/http_request.c Index: http_request.c === RCS file: /export/home/cvs/apache/src/http_request.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C3 -r1.16 -r1.17 *** http_request.c1996/10/08 20:43:31 1.16 --- http_request.c1996/10/16 17:29:22 1.17 *** *** 50,56 * */ ! /* $Id: http_request.c,v 1.16 1996/10/08 20:43:31 brian Exp $ */ /* * http_request.c: functions to get and process requests --- 50,56 * */ ! /* $Id: http_request.c,v 1.17 1996/10/16 17:29:22 ben Exp $ */ /* * http_request.c: functions to get and process requests *** *** 598,603 --- 598,604 */ if ((res = directory_walk (rnew)) + || (res = location_walk (rnew)) || (res = file_walk (rnew)) || (!some_auth_required (rnew) ? 0 : ((res = check_user_id (rnew)) || (res = check_auth (rnew *** *** 641,646 --- 642,648 make_full_path (rnew-pool, fdir, new_file)); if ((res = directory_walk (rnew)) + || (res = location_walk (rnew)) || (res = file_walk (rnew)) || (res = check_access (rnew)) || (!some_auth_required (rnew) ? 0 :
cvs commit: apache/src http_request.c
ben 96/10/19 03:07:44 Modified:src http_request.c Log: Remove pointless location_walk(). Revision ChangesPath 1.19 +1 -2 apache/src/http_request.c Index: http_request.c === RCS file: /export/home/cvs/apache/src/http_request.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C3 -r1.18 -r1.19 *** http_request.c1996/10/16 23:24:34 1.18 --- http_request.c1996/10/19 10:07:43 1.19 *** *** 50,56 * */ ! /* $Id: http_request.c,v 1.18 1996/10/16 23:24:34 fielding Exp $ */ /* * http_request.c: functions to get and process requests --- 50,56 * */ ! /* $Id: http_request.c,v 1.19 1996/10/19 10:07:43 ben Exp $ */ /* * http_request.c: functions to get and process requests *** *** 642,648 make_full_path (rnew-pool, fdir, new_file)); if ((res = directory_walk (rnew)) - || (res = location_walk (rnew)) || (res = file_walk (rnew)) || (res = check_access (rnew)) || (!some_auth_required (rnew) ? 0 : --- 642,647
cvs commit: apache/src http_request.c
ben 96/10/19 07:20:22
Modified:src http_request.c
Log:
Correct miscounting of directories.
Submitted by: Paul Sutton
Revision ChangesPath
1.20 +5 -1 apache/src/http_request.c
Index: http_request.c
===
RCS file: /export/home/cvs/apache/src/http_request.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C3 -r1.19 -r1.20
*** http_request.c1996/10/19 10:07:43 1.19
--- http_request.c1996/10/19 14:20:20 1.20
***
*** 50,56
*
*/
! /* $Id: http_request.c,v 1.19 1996/10/19 10:07:43 ben Exp $ */
/*
* http_request.c: functions to get and process requests
--- 50,56
*
*/
! /* $Id: http_request.c,v 1.20 1996/10/19 14:20:20 ben Exp $ */
/*
* http_request.c: functions to get and process requests
***
*** 270,277
--- 270,281
no2slash (test_filename);
num_dirs = count_dirs(test_filename);
+
get_path_info (r);
+ if (test_filename[strlen(test_filename)-1] == '/')
+ --num_dirs;
+
if (S_ISDIR (r-finfo.st_mode)) ++num_dirs;
for (i = 1; i = num_dirs; ++i) {
cvs commit: apache/src http_request.c
ben 96/10/19 07:44:40
Modified:src http_request.c
Log:
Process Location after Files.
Reviewed by: Alexei Kosut, Roy Fielding, Jim Jagielski
Revision ChangesPath
1.21 +7 -7 apache/src/http_request.c
Index: http_request.c
===
RCS file: /export/home/cvs/apache/src/http_request.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C3 -r1.20 -r1.21
*** http_request.c1996/10/19 14:20:20 1.20
--- http_request.c1996/10/19 14:44:39 1.21
***
*** 50,56
*
*/
! /* $Id: http_request.c,v 1.20 1996/10/19 14:20:20 ben Exp $ */
/*
* http_request.c: functions to get and process requests
--- 50,56
*
*/
! /* $Id: http_request.c,v 1.21 1996/10/19 14:44:39 ben Exp $ */
/*
* http_request.c: functions to get and process requests
***
*** 602,609
*/
if ((res = directory_walk (rnew))
- || (res = location_walk (rnew))
|| (res = file_walk (rnew))
|| (!some_auth_required (rnew) ? 0 :
((res = check_user_id (rnew)) || (res = check_auth (rnew
|| (res = check_access (rnew))
--- 602,609
*/
if ((res = directory_walk (rnew))
|| (res = file_walk (rnew))
+ || (res = location_walk (rnew))
|| (!some_auth_required (rnew) ? 0 :
((res = check_user_id (rnew)) || (res = check_auth (rnew
|| (res = check_access (rnew))
***
*** 826,840
return;
}
- if ((access_status = location_walk (r))) {
- die (access_status, r);
- return;
- }
-
if ((access_status = file_walk (r))) {
die (access_status, r);
return;
}
if ((access_status = check_access (r)) != 0) {
decl_die (access_status, check access, r);
--- 826,840
return;
}
if ((access_status = file_walk (r))) {
die (access_status, r);
return;
}
+
+ if ((access_status = location_walk (r))) {
+ die (access_status, r);
+ return;
+ }
if ((access_status = check_access (r)) != 0) {
decl_die (access_status, check access, r);
cvs commit: apache/src http_request.c
ben 96/10/19 08:17:07
Modified:src http_request.c
Log:
Apply Location sections before name translation.
Revision ChangesPath
1.22 +19 -2 apache/src/http_request.c
Index: http_request.c
===
RCS file: /export/home/cvs/apache/src/http_request.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C3 -r1.21 -r1.22
*** http_request.c1996/10/19 14:44:39 1.21
--- http_request.c1996/10/19 15:17:06 1.22
***
*** 50,56
*
*/
! /* $Id: http_request.c,v 1.21 1996/10/19 14:44:39 ben Exp $ */
/*
* http_request.c: functions to get and process requests
--- 50,56
*
*/
! /* $Id: http_request.c,v 1.22 1996/10/19 15:17:06 ben Exp $ */
/*
* http_request.c: functions to get and process requests
***
*** 567,572
--- 567,573
rnew-server = r-server;
rnew-request_config = create_request_config (rnew-pool);
rnew-htaccess = r-htaccess; /* copy htaccess cache */
+ rnew-per_dir_config=r-server-lookup_defaults;
set_sub_req_protocol (rnew, r);
if (new_file[0] == '/')
***
*** 587,592
--- 588,598
getparents (rnew-uri);
+ if ((res = location_walk (rnew))) {
+ rnew-status=res;
+ return rnew;
+ }
+
res = translate_name(rnew);
if (res)
{
***
*** 600,605
--- 606,613
* of translate_name.
* Instead we rely on the cache of .htaccess results.
*/
+ /* NB: directory_walk() clears the per_dir_config, so we don't inherit
from
+location_walk() above */
if ((res = directory_walk (rnew))
|| (res = file_walk (rnew))
***
*** 776,781
--- 784,790
void process_request_internal (request_rec *r)
{
int access_status;
+ void *save_per_dir_config;
/* Kludge to be reading the assbackwards field outside of protocol.c,
* but we've got to check for this sort of nonsense somewhere...
***
*** 816,826
getparents(r-uri); /* OK --- shrinking transformations... */
}
if ((access_status = translate_name (r))) {
decl_die (access_status, translate, r);
return;
}
!
if ((access_status = directory_walk (r))) {
die (access_status, r);
return;
--- 825,843
getparents(r-uri); /* OK --- shrinking transformations... */
}
+ if ((access_status = location_walk (r))) {
+ die (access_status, r);
+ return;
+ }
+
if ((access_status = translate_name (r))) {
decl_die (access_status, translate, r);
return;
}
!
! /* NB: directory_walk() clears the per_dir_config, so we don't inherit
from
!location_walk() above */
!
if ((access_status = directory_walk (r))) {
die (access_status, r);
return;
cvs commit: apache/src http_protocol.c
ben 96/10/19 10:02:17
Modified:src http_protocol.c
Log:
An illegal response code caused Apache to dump core. Fixed.
Revision ChangesPath
1.58 +4 -10 apache/src/http_protocol.c
Index: http_protocol.c
===
RCS file: /export/home/cvs/apache/src/http_protocol.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -C3 -r1.57 -r1.58
*** http_protocol.c 1996/10/16 23:24:33 1.57
--- http_protocol.c 1996/10/19 17:02:16 1.58
***
*** 50,56
*
*/
! /* $Id: http_protocol.c,v 1.57 1996/10/16 23:24:33 fielding Exp $ */
/*
* http_protocol.c --- routines which directly communicate with the
--- 50,56
*
*/
! /* $Id: http_protocol.c,v 1.58 1996/10/19 17:02:16 ben Exp $ */
/*
* http_protocol.c --- routines which directly communicate with the
***
*** 856,862
int i, pos;
if (status 100) /* Below 100 is illegal for HTTP status */
! return -1;
for (i = 0; i 5; i++) {
status -= 100;
--- 856,862
int i, pos;
if (status 100) /* Below 100 is illegal for HTTP status */
! return LEVEL_500;
for (i = 0; i 5; i++) {
status -= 100;
***
*** 865,874
if (pos shortcut[i+1])
return pos;
else
! return -1; /* status unknown (falls in gap) */
}
}
!return -1; /* 600 or above is also illegal */
}
--- 865,874
if (pos shortcut[i+1])
return pos;
else
! return LEVEL_500; /* status unknown (falls in gap) */
}
}
!return LEVEL_500; /* 600 or above is also illegal */
}
***
*** 1305,1316
char *location = table_get (r-headers_out, Location);
int status = r-status;
int idx = index_of_response (status);
-
- /* If status code not found, use code 500. */
- if (idx == -1) {
- status = HTTP_INTERNAL_SERVER_ERROR;
- idx = index_of_response(HTTP_INTERNAL_SERVER_ERROR);
- }
if (!r-assbackwards) {
int i;
--- 1305,1310
cvs commit: apache/src http_protocol.h
ben 96/10/20 07:44:35 Modified:src http_protocol.h Log: Remove declaration for nonexistent function add_env_var(). Revision ChangesPath 1.10 +0 -4 apache/src/http_protocol.h Index: http_protocol.h === RCS file: /export/home/cvs/apache/src/http_protocol.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C3 -r1.9 -r1.10 *** http_protocol.h 1996/10/08 21:46:59 1.9 --- http_protocol.h 1996/10/20 14:44:34 1.10 *** *** 50,57 * */ - /* $Id: http_protocol.h,v 1.9 1996/10/08 21:46:59 brian Exp $ */ - /* * Prototypes for routines which either talk directly back to the user, * or control the ones that eventually do. --- 50,55 *** *** 93,100 int set_content_length (request_rec *r, long length); int set_keepalive (request_rec *r); int set_last_modified (request_rec *r, time_t mtime); - - void add_env_var (array_header *env, char *header_name, char *val); /* Other ways to send stuff at the client. All of these keep track * of bytes_sent automatically. This indirection is intended to make --- 91,96
cvs commit: apache/src http_protocol.c http_protocol.h
ben 96/10/20 08:40:06 Modified:src http_protocol.c http_protocol.h Log: Correct spelling mistake. Revision ChangesPath 1.59 +1 -3 apache/src/http_protocol.c Index: http_protocol.c === RCS file: /export/home/cvs/apache/src/http_protocol.c,v retrieving revision 1.58 retrieving revision 1.59 diff -C3 -r1.58 -r1.59 *** http_protocol.c 1996/10/19 17:02:16 1.58 --- http_protocol.c 1996/10/20 15:40:05 1.59 *** *** 50,57 * */ - /* $Id: http_protocol.c,v 1.58 1996/10/19 17:02:16 ben Exp $ */ - /* * http_protocol.c --- routines which directly communicate with the * client. --- 50,55 *** *** 1081,1087 *the module should assume that the input is of a non-entity type *(e.g. a GET request). This step also sends a 100 Continue response *to HTTP/1.1 clients, so should not be called until the module ! *is *defenitely* ready to read content. (otherwise, the point of the *100 response is defeated). Never call this function more than once. * * 3. Finally, call get_client_block in a loop. Pass it a buffer and its --- 1079,1085 *the module should assume that the input is of a non-entity type *(e.g. a GET request). This step also sends a 100 Continue response *to HTTP/1.1 clients, so should not be called until the module ! *is *definitely* ready to read content. (otherwise, the point of the *100 response is defeated). Never call this function more than once. * * 3. Finally, call get_client_block in a loop. Pass it a buffer and its 1.11 +0 -3 apache/src/http_protocol.h Index: http_protocol.h === RCS file: /export/home/cvs/apache/src/http_protocol.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C3 -r1.10 -r1.11 *** http_protocol.h 1996/10/20 14:44:34 1.10 --- http_protocol.h 1996/10/20 15:40:05 1.11 *** *** 110,118 * definitions of the macros would get a whole lot hairier. */ - #if 0 - long rprintf (request_rec *r, char *s, ...); - #endif int rputc (int c, request_rec *r); int rputs(const char *str, request_rec *r); int rvputs(request_rec *r, ...); --- 110,115
cvs commit: apache/src http_config.c http_config.h http_core.c http_log.c http_log.h http_protocol.c http_protocol.h http_request.c http_request.h httpd.h mod_access.c mod_actions.c mod_alias.c mod_auth.c mod_browser.c mod_cgi.c mod_dir.c mod_env.c mod_include.c mod_log_config.c mod_mime.c mod_negotiation.c mod_userdir.c util.c util_script.c
ben 96/10/20 11:03:46
Modified:src http_config.c http_config.h http_core.c http_log.c
http_log.h http_protocol.c http_protocol.h
http_request.c http_request.h httpd.h mod_access.c
mod_actions.c mod_alias.c mod_auth.c mod_browser.c
mod_cgi.c mod_dir.c mod_env.c mod_include.c
mod_log_config.c mod_mime.c mod_negotiation.c
mod_userdir.c util.c util_script.c
Log:
More constification.
Revision ChangesPath
1.27 +17 -15apache/src/http_config.c
Index: http_config.c
===
RCS file: /export/home/cvs/apache/src/http_config.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C3 -r1.26 -r1.27
*** http_config.c 1996/10/09 15:23:08 1.26
--- http_config.c 1996/10/20 18:03:29 1.27
***
*** 50,56
*
*/
! /* $Id: http_config.c,v 1.26 1996/10/09 15:23:08 mjc Exp $ */
/*
* http_config.c: once was auxillary functions for reading httpd's config
--- 50,56
*
*/
! /* $Id: http_config.c,v 1.27 1996/10/20 18:03:29 ben Exp $ */
/*
* http_config.c: once was auxillary functions for reading httpd's config
***
*** 398,406
* invoking the function...
*/
! char *invoke_cmd(command_rec *cmd, cmd_parms *parms, void *mconfig, char
*args)
{
! char *w, *w2, *w3, *errmsg;
if ((parms-override cmd-req_override) == 0)
return pstrcat (parms-pool, cmd-name, not allowed here, NULL);
--- 398,408
* invoking the function...
*/
! const char *invoke_cmd(const command_rec *cmd, cmd_parms *parms, void
*mconfig,
! const char *args)
{
! char *w, *w2, *w3;
! const char *errmsg;
if ((parms-override cmd-req_override) == 0)
return pstrcat (parms-pool, cmd-name, not allowed here, NULL);
***
*** 540,546
}
}
! command_rec *find_command (char *name, command_rec *cmds)
{
while (cmds-name)
if (!strcasecmp (name, cmds-name))
--- 542,548
}
}
! const command_rec *find_command (const char *name, const command_rec *cmds)
{
while (cmds-name)
if (!strcasecmp (name, cmds-name))
***
*** 551,559
return NULL;
}
! command_rec *find_command_in_modules (char *cmd_name, module **mod)
{
!command_rec *cmdp;
module *modp;
for (modp = *mod; modp; modp = modp-next)
--- 553,561
return NULL;
}
! const command_rec *find_command_in_modules (const char *cmd_name, module
**mod)
{
!const command_rec *cmdp;
module *modp;
for (modp = *mod; modp; modp = modp-next)
***
*** 565,574
return NULL;
}
! char *handle_command (cmd_parms *parms, void *config, char *l)
{
! char *args, *cmd_name, *retval;
! command_rec *cmd;
module *mod = top_module;
++parms-config_line;
--- 567,576
return NULL;
}
! const char *handle_command (cmd_parms *parms, void *config, const char *l)
{
! const char *args, *cmd_name, *retval;
! const command_rec *cmd;
module *mod = top_module;
++parms-config_line;
***
*** 606,617
return retval;
}
! char *srm_command_loop (cmd_parms *parms, void *config)
{
char l[MAX_STRING_LEN];
while (!(cfg_getline (l, MAX_STRING_LEN, parms-infile))) {
! char *errmsg = handle_command (parms, config, l);
if (errmsg) return errmsg;
}
--- 608,619
return retval;
}
! const char *srm_command_loop (cmd_parms *parms, void *config)
{
char l[MAX_STRING_LEN];
while (!(cfg_getline (l, MAX_STRING_LEN, parms-infile))) {
! const char *errmsg = handle_command (parms, config, l);
if (errmsg) return errmsg;
}
***
*** 622,628
* Generic command functions...
*/
! char *set_string_slot (cmd_parms *cmd, char *struct_ptr, char *arg)
{
/* This one's pretty generic... */
--- 624,630
* Generic command functions...
*/
! const char *set_string_slot (cmd_parms *cmd, char *struct_ptr, char *arg)
{
/* This one's pretty generic... */
***
*** 652,658
void process_resource_config(server_rec *s, char *fname, pool *p, pool
*ptemp)
{
FILE *cfg;
! char *errmsg;
cmd_parms parms;
fname = server_root_relative (p, fname);
--- 654,660
void process_resource_config(server_rec *s,
cvs commit: apache/src http_protocol.c http_request.c http_request.h httpd.h util.c util_script.c util_script.h
ben 96/10/20 13:45:56
Modified:src http_protocol.c http_request.c http_request.h
httpd.h util.c util_script.c util_script.h
Log:
Even more constification.
Revision ChangesPath
1.61 +3 -3 apache/src/http_protocol.c
Index: http_protocol.c
===
RCS file: /export/home/cvs/apache/src/http_protocol.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -C3 -r1.60 -r1.61
*** http_protocol.c 1996/10/20 18:03:31 1.60
--- http_protocol.c 1996/10/20 20:45:50 1.61
***
*** 440,446
}
}
! char *check_fulluri (request_rec *r, char *uri) {
char *name, *host;
int i, port;
--- 440,446
}
}
! const char *check_fulluri (request_rec *r, const char *uri) {
char *name, *host;
int i, port;
***
*** 494,500
int read_request_line (request_rec *r)
{
char l[HUGE_STRING_LEN];
! char *ll = l, *uri;
conn_rec *conn = r-connection;
int major = 1, minor = 0; /* Assume HTTP/1.0 if non-HTTP
protocol*/
--- 494,500
int read_request_line (request_rec *r)
{
char l[HUGE_STRING_LEN];
! const char *ll = l, *uri;
conn_rec *conn = r-connection;
int major = 1, minor = 0; /* Assume HTTP/1.0 if non-HTTP
protocol*/
***
*** 783,789
}
t = uudecode (r-pool, auth_line);
! r-connection-user = getword_nulls (r-pool, t, ':');
r-connection-auth_type = Basic;
*pw = t;
--- 783,789
}
t = uudecode (r-pool, auth_line);
! r-connection-user = getword_nulls_nc (r-pool, t, ':');
r-connection-auth_type = Basic;
*pw = t;
1.24 +7 -7 apache/src/http_request.c
Index: http_request.c
===
RCS file: /export/home/cvs/apache/src/http_request.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C3 -r1.23 -r1.24
*** http_request.c1996/10/20 18:03:32 1.23
--- http_request.c1996/10/20 20:45:51 1.24
***
*** 50,56
*
*/
! /* $Id: http_request.c,v 1.23 1996/10/20 18:03:32 ben Exp $ */
/*
* http_request.c: functions to get and process requests
--- 50,56
*
*/
! /* $Id: http_request.c,v 1.24 1996/10/20 20:45:51 ben Exp $ */
/*
* http_request.c: functions to get and process requests
***
*** 516,522
return rr;
}
! request_rec *sub_req_lookup_simple (char *new_file, request_rec *r)
{
/* This handles the simple case, common to ..._lookup_uri and _file,
* of looking up another file in the same directory.
--- 516,522
return rr;
}
! request_rec *sub_req_lookup_simple (const char *new_file, const request_rec
*r)
{
/* This handles the simple case, common to ..._lookup_uri and _file,
* of looking up another file in the same directory.
***
*** 625,631
return rnew;
}
! request_rec *sub_req_lookup_file (char *new_file, request_rec *r)
{
request_rec *rnew;
int res;
--- 625,631
return rnew;
}
! request_rec *sub_req_lookup_file (const char *new_file, const request_rec
*r)
{
request_rec *rnew;
int res;
***
*** 650,656
rnew-uri = INTERNALLY GENERATED file-relative req;
rnew-filename = ((new_file[0] == '/') ?
! new_file :
make_full_path (rnew-pool, fdir, new_file));
if ((res = directory_walk (rnew))
--- 650,656
rnew-uri = INTERNALLY GENERATED file-relative req;
rnew-filename = ((new_file[0] == '/') ?
! pstrdup(rnew-pool,new_file) :
make_full_path (rnew-pool, fdir, new_file));
if ((res = directory_walk (rnew))
***
*** 925,931
return new;
}
! request_rec *internal_internal_redirect (char *new_uri, request_rec *r)
{
request_rec *new = (request_rec *)pcalloc(r-pool, sizeof(request_rec));
char t[10]; /* Long enough... */
--- 925,931
return new;
}
! request_rec *internal_internal_redirect (const char *new_uri, request_rec
*r)
{
request_rec *new = (request_rec *)pcalloc(r-pool, sizeof(request_rec));
char t[10]; /* Long enough... */
***
*** 980,986
return new;
}
! void internal_redirect (char *new_uri, request_rec *r)
{
request_rec *new = internal_internal_redirect(new_uri, r);
cvs commit: apache/manual - New directory
ben 96/11/01 09:48:32 apache/manual - New directory
cvs commit: apache/manual/1.2 - New directory
ben 96/11/01 10:11:44 apache/manual/1.2 - New directory
cvs commit: apache-docs/html - New directory
ben 96/11/02 04:35:40 apache-docs/html - New directory
cvs commit: apache-docs/html LICENSE
ben 96/11/02 04:36:48 Added: html LICENSE Log: Import existing docs.
cvs commit: apache-docs/html/1.1 - New directory
ben 96/11/02 04:58:59 apache-docs/html/1.1 - New directory
cvs commit: apache-docs/html/1.2 - New directory
ben 96/11/02 04:58:59 apache-docs/html/1.2 - New directory
cvs commit: apache-docs/html/1.0/unref - New directory
ben 96/11/02 05:14:47 apache-docs/html/1.0/unref - New directory
cvs commit: apache-docs/html/1.0/unref/changelog - New directory
ben 96/11/02 05:15:20 apache-docs/html/1.0/unref/changelog - New directory
cvs commit: apache/src httpd.h
ben 96/11/23 15:18:53 Modified:src httpd.h Log: Minor correctness fix. Revision ChangesPath 1.62 +6 -6 apache/src/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache/src/httpd.h,v retrieving revision 1.61 retrieving revision 1.62 diff -C3 -r1.61 -r1.62 *** httpd.h 1996/11/14 07:24:42 1.61 --- httpd.h 1996/11/23 23:18:52 1.62 *** *** 311,322 #define BAD_GATEWAY HTTP_BAD_GATEWAY #define VARIANT_ALSO_VARIES HTTP_VARIANT_ALSO_VARIES ! #define is_HTTP_INFO(x) ((x = 100)(x 200)) ! #define is_HTTP_SUCCESS(x) ((x = 200)(x 300)) ! #define is_HTTP_REDIRECT(x) ((x = 300)(x 400)) ! #define is_HTTP_ERROR(x)((x = 400)(x 600)) ! #define is_HTTP_CLIENT_ERROR(x) ((x = 400)(x 500)) ! #define is_HTTP_SERVER_ERROR(x) ((x = 500)(x 600)) #define METHODS 8 --- 311,322 #define BAD_GATEWAY HTTP_BAD_GATEWAY #define VARIANT_ALSO_VARIES HTTP_VARIANT_ALSO_VARIES ! #define is_HTTP_INFO(x) (((x) = 100)((x) 200)) ! #define is_HTTP_SUCCESS(x) (((x) = 200)((x) 300)) ! #define is_HTTP_REDIRECT(x) (((x) = 300)((x) 400)) ! #define is_HTTP_ERROR(x)(((x) = 400)((x) 600)) ! #define is_HTTP_CLIENT_ERROR(x) (((x) = 400)((x) 500)) ! #define is_HTTP_SERVER_ERROR(x) (((x) = 500)((x) 600)) #define METHODS 8
cvs commit: apache/src mod_cgi.c
ben 96/11/25 05:32:49
Modified:src mod_cgi.c
Log:
Squash a warning.
Revision ChangesPath
1.22 +1 -1 apache/src/mod_cgi.c
Index: mod_cgi.c
===
RCS file: /export/home/cvs/apache/src/mod_cgi.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C3 -r1.21 -r1.22
*** mod_cgi.c 1996/11/25 11:22:00 1.21
--- mod_cgi.c 1996/11/25 13:32:48 1.22
***
*** 432,438
strncpy(dbuf + dbpos, argsbuffer, dbsize);
dbpos += dbsize;
}
! if (fwrite(argsbuffer, 1, len_read, script_out) len_read) {
/* silly script stopped reading, soak up remaining message */
while (get_client_block(r, argsbuffer, HUGE_STRING_LEN) 0)
; /* dump it */
--- 432,438
strncpy(dbuf + dbpos, argsbuffer, dbsize);
dbpos += dbsize;
}
! if (fwrite(argsbuffer, 1, len_read, script_out) (size_t)len_read)
{
/* silly script stopped reading, soak up remaining message */
while (get_client_block(r, argsbuffer, HUGE_STRING_LEN) 0)
; /* dump it */
cvs commit: apache/htdocs/manual new_features_1_2.html
ben 96/11/26 12:09:58 Modified:htdocs/manual new_features_1_2.html Log: Numerous HTML cockups and broken links. Revision ChangesPath 1.3 +23 -23apache/htdocs/manual/new_features_1_2.html Index: new_features_1_2.html === RCS file: /export/home/cvs/apache/htdocs/manual/new_features_1_2.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C3 -r1.2 -r1.3 *** new_features_1_2.html 1996/11/21 10:47:15 1.2 --- new_features_1_2.html 1996/11/26 20:09:56 1.3 *** *** 12,27 will no longer work (specifically, those that process input using the POST or PUT methods). If you encounter a module that does not work, please contact the author. A a ! href=client_block_api.htmlprogrammer's note/a on the subject is available./p h2New Features with Apache 1.2/h2 pNew features with this release, as extensions of the Apache ! functionality Because the core code has changed so significantly, there are certain liberties that earlier versions of Apache (and the NCSA daemon) took that recent Apache versions are pickier about - please check the a ! href=compat_notes.htmlcompatibility notes/a if you have any problems./p hr --- 12,27 will no longer work (specifically, those that process input using the POST or PUT methods). If you encounter a module that does not work, please contact the author. A a ! href=misc/client_block_api.htmlprogrammer's note/a on the subject is available./p h2New Features with Apache 1.2/h2 pNew features with this release, as extensions of the Apache ! functionality. Because the core code has changed so significantly, there are certain liberties that earlier versions of Apache (and the NCSA daemon) took that recent Apache versions are pickier about - please check the a ! href=misc/compat_notes.htmlcompatibility notes/a if you have any problems./p hr *** *** 31,37 ul ! liba name=http11.htmlHTTP/1.1 Compliance/a/bbr Apache (except for the optional proxy) is fully compliant with the new HTTP/1.1 standard, as ratified by the a href=http://www.ics.uci.edu/pub/ietf/http/;IETF HTTP --- 31,37 ul ! liba href=http11.htmlHTTP/1.1 Compliance/a/bbr Apache (except for the optional proxy) is fully compliant with the new HTTP/1.1 standard, as ratified by the a href=http://www.ics.uci.edu/pub/ietf/http/;IETF HTTP *** *** 39,52 should allow for greater performance and efficiency when transfering files. Apache does, however, still work great with HTTP/1.0 browsers. ! liba href=xssi.htmleXtended Server Side Includes (XSSI)/a/bbr A new set of server-side include directives allows the user to better create WWW pages. This includes number of powerful new features, such as the ability to set variables and use conditional HTML. ! liba name=files.htmlFile-based and Regex-enabled Directive Sections/a/bbr The new codelt;Filesgt;/code section allows directives to be enabled based on full filename, not just directory and URL. In --- 39,52 should allow for greater performance and efficiency when transfering files. Apache does, however, still work great with HTTP/1.0 browsers. ! liba href=mod/xssi.htmleXtended Server Side Includes (XSSI)/a/bbr A new set of server-side include directives allows the user to better create WWW pages. This includes number of powerful new features, such as the ability to set variables and use conditional HTML. ! liba href=files.htmlFile-based and Regex-enabled Directive Sections/a/bbr The new codelt;Filesgt;/code section allows directives to be enabled based on full filename, not just directory and URL. In *** *** 56,75 also now be based on regular expressions, not just simple prefix matching. ! liba name=mod_browser.htmlBrowser-based Environment Variables/a/bbr Environment variables can now be set based on the codeUser-Agent/code string of the browser. Combined with a href=xssi.htmlXSSI/a, this allows you to write browser-based conditional HTML documents. ! liba name=sucgi.htmlSetUID CGI Execution/a/b Apache now supports the execution of CGI scripts as users other than the server user. A number of security checks are built in to try and make this as safe as possible. ! liba name=mod_rewrite.htmlURL Rewriting Module/a/bbr The optional codemod_rewrite/code module is now included. This module can provide powerful URL mapping, using regular expressions. There's nothing this module can't do! --- 56,75 also now be based on regular expressions, not just simple prefix matching. !
cvs commit: apache/src http_main.c
ben 96/11/26 12:11:45
Modified:src http_main.c
Log:
Squash a bug with non-DNSed virtual hosts.
Revision ChangesPath
1.90 +5 -0 apache/src/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache/src/http_main.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -C3 -r1.89 -r1.90
*** http_main.c 1996/11/22 03:17:07 1.89
--- http_main.c 1996/11/26 20:11:44 1.90
***
*** 1323,1328
--- 1323,1333
sizeof (struct in_addr), AF_INET);
if (h != NULL)
s-server_hostname = pstrdup (pconf, (char *)h-h_name);
+ else
+ {
+ fprintf(stderr,Failed to resolve server name (check
DNS)\n);
+ exit(0);
+ }
}
}
}
cvs commit: apache/src/helpers GuessOS
ben 96/12/03 06:15:31
Modified:src Configure
src/helpers GuessOS
Log:
Configuration fixes for Ultrix, IRIX64, Unixware.
Submitted by: various Apache users
Revision ChangesPath
1.39 +14 -0 apache/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.38
retrieving revision 1.39
diff -C3 -r1.38 -r1.39
*** Configure 1996/12/03 01:06:11 1.38
--- Configure 1996/12/03 14:15:28 1.39
***
*** 268,275
--- 268,289
CFLAGS=$CFLAGS -DUXPDS
LIBS=$LIBS -lsocket -lnsl
;;
+ *-ultrix)
+ OS='ULTRIX'
+ CFLAGS=-DULTRIX
+ ;;
*) # default: Catch systems we don't know about
echo Sorry, but we cannot grok \$PLAT\
+ echo uname -m
+ uname -m
+ echo uname -r
+ uname -r
+ echo uname -s
+ uname -s
+ echo uname -v
+ uname -v
+ echo uname -X
+ uname -X
echo Please Email this output to [EMAIL PROTECTED]
echo Thank you
exit 1
1.2 +12 -2 apache/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
retrieving revision 1.1
retrieving revision 1.2
diff -C3 -r1.1 -r1.2
*** GuessOS 1996/10/23 12:56:34 1.1
--- GuessOS 1996/12/03 14:15:30 1.2
***
*** 19,26
VERSION=`(uname -v) 2/dev/null` || VERSION=unknown
! # Now test for SCO, since it is has a unique uname option
! # that allows us to do a quick test
#
# We need to work around FreeBSD 1.1.5.1
SCO=`uname -X 2/dev/null | grep ^Release | cut -f3 -d' '`
--- 19,25
VERSION=`(uname -v) 2/dev/null` || VERSION=unknown
! # Now test for SCO, since it is has a braindamaged uname.
#
# We need to work around FreeBSD 1.1.5.1
SCO=`uname -X 2/dev/null | grep ^Release | cut -f3 -d' '`
***
*** 32,37
--- 31,39
3\.2v5\.0\.0)
echo whatever-whatever-sco5; exit 0
;;
+ 4\.2MP)
+ echo whatever-whatever-unixware2; exit 0
+ ;;
esac
else
# Now we simply scan though... In most cases, the SYSTEM info is enough
***
*** 65,70
--- 67,76
echo ${MACHINE}-sgi-irix; exit 0
;;
+ IRIX64:*)
+ echo ${MACHINE}-sgi-irix64; exit 0
+ ;;
+
Linux:*)
echo ${MACHINE}-whatever-linux; exit 0
;;
***
*** 127,132
--- 133,142
*:4.0:*:3[34]??,* | *:4.0:*:3[34]??,*)
echo ${MACHINE}-whatever-sysv4; exit 0
+ ;;
+
+ ULTRIX:*)
+ echo ${MACHINE}-unknown-ultrix; exit 0
;;
esac
cvs commit: apache/src conf.h
ben 96/12/03 09:44:28 Modified:src conf.h Log: NeXT fix. Revision ChangesPath 1.52 +7 -0 apache/src/conf.h Index: conf.h === RCS file: /export/home/cvs/apache/src/conf.h,v retrieving revision 1.51 retrieving revision 1.52 diff -C3 -r1.51 -r1.52 *** conf.h1996/12/03 17:35:28 1.51 --- conf.h1996/12/03 17:44:24 1.52 *** *** 188,193 --- 188,200 #ifndef S_IWUSR #define S_IWUSR S_IWRITE #endif + #ifndef S_IWGRP + #define S_IWGRP 20 + #endif + #ifndef S_IWOTH + #define S_IWOTH 02 + #endif + #define STDIN_FILENO 0 #define STDOUT_FILENO 1 #define STDERR_FILENO 2
cvs commit: apache/src mod_expires.c
ben 96/12/04 14:56:26
Modified:src mod_expires.c
Log:
Oops. Get isdigit() change right.
Revision ChangesPath
1.4 +1 -1 apache/src/mod_expires.c
Index: mod_expires.c
===
RCS file: /export/home/cvs/apache/src/mod_expires.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C3 -r1.3 -r1.4
*** mod_expires.c 1996/12/04 20:16:42 1.3
--- mod_expires.c 1996/12/04 22:56:24 1.4
***
*** 278,284
while ( word[0] ) {
/* num
*/
! if ( isdigit(word[0]) != NULL ) {
num = atoi( word );
} else {
return pstrcat( pool, bad expires code, numeric value expected
num ',
--- 278,284
while ( word[0] ) {
/* num
*/
! if (isdigit(word[0])) {
num = atoi( word );
} else {
return pstrcat( pool, bad expires code, numeric value expected
num ',
cvs commit: apache/src/helpers GuessOS
ben 96/12/05 02:29:12
Modified:src/helpers GuessOS
Log:
SCO5 and NCR fixes.
Revision ChangesPath
1.5 +5 -1 apache/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
retrieving revision 1.4
retrieving revision 1.5
diff -C3 -r1.4 -r1.5
*** GuessOS 1996/12/04 01:48:15 1.4
--- GuessOS 1996/12/05 10:29:11 1.5
***
*** 28,34
3\.2v4\.2)
echo whatever-whatever-sco3; exit 0
;;
! 3\.2v5\.0\.0)
echo whatever-whatever-sco5; exit 0
;;
4\.2MP)
--- 28,34
3\.2v4\.2)
echo whatever-whatever-sco3; exit 0
;;
! 3\.2v5\.0*)
echo whatever-whatever-sco5; exit 0
;;
4\.2MP)
***
*** 141,146
--- 141,150
SINIX*)
echo ${MACHINE}-whatever-sysv4; exit 0
+ ;;
+
+ library:*)
+ echo ${MACHINE}-ncr-sysv4; exit 0
;;
esac
cvs commit: apache/src conf.h
ben 96/12/05 02:30:08 Modified:src conf.h Log: Correct crypt definition. Revision ChangesPath 1.54 +1 -1 apache/src/conf.h Index: conf.h === RCS file: /export/home/cvs/apache/src/conf.h,v retrieving revision 1.53 retrieving revision 1.54 diff -C3 -r1.53 -r1.54 *** conf.h1996/12/04 01:43:03 1.53 --- conf.h1996/12/05 10:30:07 1.54 *** *** 65,71 #define HAVE_SYS_RESOURCE_H #undef NO_KILLPG #undef NO_SETSID ! char *crypt(char *pw, char *salt); #define JMP_BUF sigjmp_buf #define HAVE_MMAP #include sys/time.h --- 65,71 #define HAVE_SYS_RESOURCE_H #undef NO_KILLPG #undef NO_SETSID ! char *crypt(const char *pw, const char *salt); #define JMP_BUF sigjmp_buf #define HAVE_MMAP #include sys/time.h
cvs commit: apache/src Configure
ben 96/12/05 02:48:30 Modified:src Configure Log: Make Irix 64 compile Apache 32-bit for now. Revision ChangesPath 1.42 +5 -1 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.41 retrieving revision 1.42 diff -C3 -r1.41 -r1.42 *** Configure 1996/12/03 17:35:27 1.41 --- Configure 1996/12/05 10:48:29 1.42 *** *** 171,177 OS='HP-UX' CFLAGS=$CFLAGS -DHPUX ;; ! *-sgi-irix*) DEF_WANTHSREGEX=yes DBM_LIB= if [ $RULE_IRIXNIS = yes ]; then --- 171,181 OS='HP-UX' CFLAGS=$CFLAGS -DHPUX ;; ! *-sgi-irix64) ! # Note: We'd like to see patches to compile 64-bit, but for now... ! CFLAGS=$CFLAGS -n32 ! LFLAGS=$LFLAGS -n32 ! *-sgi-irix) DEF_WANTHSREGEX=yes DBM_LIB= if [ $RULE_IRIXNIS = yes ]; then
cvs commit: apache/src Configure
ben 96/12/05 03:06:07 Modified:src Configure Log: Ahem. Correct Irix 64 patch. Revision ChangesPath 1.43 +11 -0 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.42 retrieving revision 1.43 diff -C3 -r1.42 -r1.43 *** Configure 1996/12/05 10:48:29 1.42 --- Configure 1996/12/05 11:06:06 1.43 *** *** 175,180 --- 175,191 # Note: We'd like to see patches to compile 64-bit, but for now... CFLAGS=$CFLAGS -n32 LFLAGS=$LFLAGS -n32 + DEF_WANTHSREGEX=yes + DBM_LIB= + if [ $RULE_IRIXNIS = yes ]; then + OS='SGI IRIX w/NIS' + CFLAGS=$CFLAGS -DIRIX + LIBS=$LIBS -lsun + else + OS='SGI IRIX' + CFLAGS=$CFLAGS -DIRIX + fi + ;; *-sgi-irix) DEF_WANTHSREGEX=yes DBM_LIB=
cvs commit: apache/src CHANGES
ben 96/12/05 03:07:30 Modified:src CHANGES Log: 1.2b2 changes. Revision ChangesPath 1.76 +7 -5 apache/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.75 retrieving revision 1.76 diff -C3 -r1.75 -r1.76 *** CHANGES 1996/12/05 03:47:06 1.75 --- CHANGES 1996/12/05 11:07:29 1.76 *** *** 2,8 *) Added PORTING information file. [Jim Jagielski] ! *) Added definitions for S_IWGRP and S_IWOTH to conf.h *) Changed default group to nogroup instead of nobody --- 2,8 *) Added PORTING information file. [Jim Jagielski] ! *) Added definitions for S_IWGRP and S_IWOTH to conf.h [Ben Laurie] *) Changed default group to nogroup instead of nobody *** *** 29,38 for better portability. *) Updated helpers/GuessOS for ... ! SCO (braindamaged uname, whatever-whatever-unixware2) ! IRIX64 (-sgi-irix64) ! ULTRIX (-unknown-ultrix) ! SINIX(-whatever-sysv4) and fixed something in helpers/PrintPath [Ben Laurie] --- 29,40 for better portability. *) Updated helpers/GuessOS for ... ! SCO 5(recognize minor releases) ! SCO Unixware (braindamaged uname, whatever-whatever-unixware2) ! IRIX64 (-sgi-irix64) ! ULTRIX (-unknown-ultrix) ! SINIX(-whatever-sysv4) ! NCR Unix (-ncr-sysv4) and fixed something in helpers/PrintPath [Ben Laurie]
cvs commit: apache/src Configure
ben 96/12/05 03:16:10 Modified:src Configure Log: Point at the PORTING file, encourage someone to port to 64 bit Irix. Revision ChangesPath 1.44 +5 -1 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.43 retrieving revision 1.44 diff -C3 -r1.43 -r1.44 *** Configure 1996/12/05 11:06:06 1.43 --- Configure 1996/12/05 11:16:09 1.44 *** *** 173,178 --- 173,180 ;; *-sgi-irix64) # Note: We'd like to see patches to compile 64-bit, but for now... + echo You are running 64-bit Irix. For now, we will compile 32-bit + echo but if you would care to port to 64-bit, send us the patches. CFLAGS=$CFLAGS -n32 LFLAGS=$LFLAGS -n32 DEF_WANTHSREGEX=yes *** *** 300,306 uname -v echo uname -X uname -X ! echo Please Email this output to [EMAIL PROTECTED] echo Thank you exit 1 ;; --- 302,310 uname -v echo uname -X uname -X ! echo Ideally, read the file PORTING, do what it says and send the ! echo resulting patches to [EMAIL PROTECTED] Otherwise, email ! echo this output to [EMAIL PROTECTED] echo Thank you exit 1 ;;
cvs commit: apache/src/helpers GuessOS
ben 96/12/05 06:07:07
Modified:src Configure util.c
src/helpers GuessOS
Log:
More QNX patches.
Submitted by: Martin Zimmerman [EMAIL PROTECTED] (adapted by Ben Laurie)
Revision ChangesPath
1.45 +6 -1 apache/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.44
retrieving revision 1.45
diff -C3 -r1.44 -r1.45
*** Configure 1996/12/05 11:16:09 1.44
--- Configure 1996/12/05 14:07:03 1.45
***
*** 235,244
OS='DEC OSF/1'
CFLAGS=$CFLAGS -DOSF1
;;
! QNX)
DEF_WANTHSREGEX=yes
OS='QNX'
CFLAGS=$CFLAGS -DQNX
LIBS=$LIBS -N128k -lsocket
;;
*-sco3*)
--- 235,249
OS='DEC OSF/1'
CFLAGS=$CFLAGS -DOSF1
;;
! *-qnx)
DEF_WANTHSREGEX=yes
OS='QNX'
CFLAGS=$CFLAGS -DQNX
+ LIBS=$LIBS -N128k -lsocket
+ ;;
+ *-qnx32)
+ OS='QNX32'
+ CFLAGS=$CFLAGS -DQNX -mf -3
LIBS=$LIBS -N128k -lsocket
;;
*-sco3*)
1.36 +10 -0 apache/src/util.c
Index: util.c
===
RCS file: /export/home/cvs/apache/src/util.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -C3 -r1.35 -r1.36
*** util.c1996/12/02 15:35:01 1.35
--- util.c1996/12/05 14:07:04 1.36
***
*** 197,202
--- 197,207
* ATT V8 regexp package.
*/
+ #ifdef QNX
+ # define rm_so rm_sp
+ # define rm_eo rm_ep
+ #endif
+
char *pregsub(pool *p, const char *input, const char *source,
size_t nmatch, regmatch_t pmatch[]) {
const char *src = input;
***
*** 260,265
--- 265,275
return dest;
}
+
+ #ifdef QNX
+ # undef rm_so
+ # undef rm_eo
+ #endif
/*
* Parse .. so we don't compromise security
1.6 +12 -0 apache/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
retrieving revision 1.5
retrieving revision 1.6
diff -C3 -r1.5 -r1.6
*** GuessOS 1996/12/05 10:29:11 1.5
--- GuessOS 1996/12/05 14:07:06 1.6
***
*** 107,112
--- 107,124
echo ${MACHINE}-dec-osf; exit 0
;;
+ QNX:*)
+ case $VERSION in
+ 423)
+ echo ${MACHINE}-qssl-qnx32
+ ;;
+ *)
+ echo ${MACHINE}-qssl-qnx
+ ;;
+ esac
+ exit 0
+ ;;
+
SunOS:5.*)
echo ${MACHINE}-sun-solaris2; exit 0
;;
cvs commit: apache/src conf.h
ben 96/12/12 08:45:34 Modified:src conf.h Log: Fix waitpid() substiture for NeXT. Revision ChangesPath 1.59 +1 -1 apache/src/conf.h Index: conf.h === RCS file: /export/home/cvs/apache/src/conf.h,v retrieving revision 1.58 retrieving revision 1.59 diff -C3 -r1.58 -r1.59 *** conf.h1996/12/10 20:12:30 1.58 --- conf.h1996/12/12 16:45:32 1.59 *** *** 202,208 #define STDIN_FILENO 0 #define STDOUT_FILENO 1 #define STDERR_FILENO 2 ! #define waitpid(a,b,c) wait4(a,(union wait *)b,c,NULL) typedef int pid_t; #define JMP_BUF jmp_buf #define NO_USE_SIGACTION --- 202,208 #define STDIN_FILENO 0 #define STDOUT_FILENO 1 #define STDERR_FILENO 2 ! #define waitpid(a,b,c) wait4((a) == -1 ? 0 : (a),(union wait *)(b),c,NULL) typedef int pid_t; #define JMP_BUF jmp_buf #define NO_USE_SIGACTION
cvs commit: apache/src CHANGES
ben 96/12/12 09:02:02 Modified:src CHANGES Log: Note NeXT waitpid fix. Revision ChangesPath 1.86 +2 -1 apache/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.85 retrieving revision 1.86 diff -C3 -r1.85 -r1.86 *** CHANGES 1996/12/12 01:02:02 1.85 --- CHANGES 1996/12/12 17:01:59 1.86 *** *** 5,11 *) Remove rlim_t typedef for NetBSD. Do older versions need this? ! *) Defined rlim_t and WANTHSREGEX=yes for NeXT. *) Removed recent modification to promote the status code on internal redirects, since the correct fix was to change the default log format --- 5,12 *) Remove rlim_t typedef for NetBSD. Do older versions need this? ! *) Defined rlim_t and WANTHSREGEX=yes and fixed waitpid() substitute for ! NeXT. *) Removed recent modification to promote the status code on internal redirects, since the correct fix was to change the default log format
cvs commit: apache/htdocs/manual/mod directives.html
ben 96/12/14 04:32:49 Modified:htdocs/manual new_features_1_2.html htdocs/manual/mod directives.html Log: Add link for missing HostNameLookups directive. Revision ChangesPath 1.18 +4 -0 apache/htdocs/manual/new_features_1_2.html Index: new_features_1_2.html === RCS file: /export/home/cvs/apache/htdocs/manual/new_features_1_2.html,v retrieving revision 1.17 retrieving revision 1.18 diff -C3 -r1.17 -r1.18 *** new_features_1_2.html 1996/12/09 06:01:14 1.17 --- new_features_1_2.html 1996/12/14 12:32:47 1.18 *** *** 133,139 --- 133,143 Apache can re-read the config files and re-open log files without terminating transactions in progress. + new_features_1_2.html + liba href=Configure.htmlSimplified Compilation/a/bbr + === liba href=install.htmlSimplified Compilation/a/bbr + 1.16 The process of configuring Apache for compilation has been simplified. 1.9 +1 -0 apache/htdocs/manual/mod/directives.html Index: directives.html === RCS file: /export/home/cvs/apache/htdocs/manual/mod/directives.html,v retrieving revision 1.8 retrieving revision 1.9 diff -C3 -r1.8 -r1.9 *** directives.html 1996/12/10 20:17:31 1.8 --- directives.html 1996/12/14 12:32:49 1.9 *** *** 68,73 --- 68,74 liA HREF=core.html#groupGroup/A liA HREF=mod_headers.html#headerHeader/A liA HREF=mod_dir.html#headernameHeaderName/A + liA HREF=where???HostNameLookups/A liA HREF=core.html#identitycheckIdentityCheck/A liA HREF=core.html#ifmoduleIfModule/A liA HREF=mod_imap.html#imapbaseImapBase/A
cvs commit: apache/src alloc.c
ben 96/12/14 12:28:47
Modified:src alloc.c
Log:
Fix bug in palloc() on sizes = 0.
Reviewed by: Rob Hartill, Chuck Murcko, Randy Terbush
Revision ChangesPath
1.20 +6 -3 apache/src/alloc.c
Index: alloc.c
===
RCS file: /export/home/cvs/apache/src/alloc.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C3 -r1.19 -r1.20
*** alloc.c 1996/12/01 20:28:10 1.19
--- alloc.c 1996/12/14 20:28:45 1.20
***
*** 100,106
! /* Get a completely new block from the system pool */
union block_hdr *malloc_block (int size)
{
--- 100,107
! /* Get a completely new block from the system pool. Note that we rely on
! malloc() to provide aligned memory. */
union block_hdr *malloc_block (int size)
{
***
*** 338,344
int nclicks = 1 + ((reqsize - 1) / CLICK_SZ);
int size = nclicks * CLICK_SZ;
!
/* First, see if we have space in the block most recently
* allocated to this pool
*/
--- 339,345
int nclicks = 1 + ((reqsize - 1) / CLICK_SZ);
int size = nclicks * CLICK_SZ;
!
/* First, see if we have space in the block most recently
* allocated to this pool
*/
***
*** 347,353
char *first_avail = blok-h.first_avail;
char *new_first_avail;
! if (size = 0) size = 1;
new_first_avail = first_avail + size;
if (new_first_avail = blok-h.endp) {
--- 348,356
char *first_avail = blok-h.first_avail;
char *new_first_avail;
! if(reqsize = 0)
! return NULL;
!
new_first_avail = first_avail + size;
if (new_first_avail = blok-h.endp) {
cvs commit: apache/src conf.h http_main.c http_main.h http_protocol.c
ben 96/12/15 07:09:37
Modified:src conf.h http_main.c http_main.h http_protocol.c
Log:
Fix keepalive timeout and waitpid substitutes.
Revision ChangesPath
1.60 +0 -1 apache/src/conf.h
Index: conf.h
===
RCS file: /export/home/cvs/apache/src/conf.h,v
retrieving revision 1.59
retrieving revision 1.60
diff -C3 -r1.59 -r1.60
*** conf.h1996/12/12 16:45:32 1.59
--- conf.h1996/12/15 15:09:33 1.60
***
*** 94,100
#define HAVE_SHMGET
#define HAVE_CRYPT_H
#define NO_LONG_DOUBLE
- #define BROKEN_WAIT
#elif defined(HPUX) || defined(HPUX10)
#define HAVE_SYS_RESOURCE_H
--- 94,99
1.96 +25 -4 apache/src/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache/src/http_main.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -C3 -r1.95 -r1.96
*** http_main.c 1996/12/10 01:11:58 1.95
--- http_main.c 1996/12/15 15:09:34 1.96
***
*** 453,459
}
}
! void hard_timeout (char *name, request_rec *r)
{
timeout_req = r;
timeout_name = name;
--- 453,459
}
}
! void keepalive_timeout (char *name, request_rec *r)
{
timeout_req = r;
timeout_name = name;
***
*** 465,470
--- 465,479
alarm (r-server-timeout);
}
+ void hard_timeout (char *name, request_rec *r)
+ {
+ timeout_req = r;
+ timeout_name = name;
+
+ signal(SIGALRM,(void (*)())timeout);
+ alarm (r-server-timeout);
+ }
+
void soft_timeout (char *name, request_rec *r)
{
timeout_name = name;
***
*** 941,962
}
}
! #ifdef BROKEN_WAIT
/*
Some systems appear to fail to deliver dead children to wait() at times.
! This sorts them out.
*/
! void reap_children()
{
int status,n;
for(n=0 ; n HARD_SERVER_LIMIT ; ++n)
if(scoreboard_image-servers[n].status != SERVER_DEAD
waitpid(scoreboard_image-servers[n].pid,status,WNOHANG) == -1
errno == ECHILD)
{
update_child_status(n,SERVER_DEAD,NULL);
}
}
#endif
--- 950,977
}
}
! #if defined(BROKEN_WAIT) || defined(NEED_WAITPID)
/*
Some systems appear to fail to deliver dead children to wait() at times.
! This sorts them out. In fact, this may have been caused by a race condition
! in wait_or_timeout(). But this routine is still useful for systems with no
! waitpid().
*/
! int reap_children()
{
int status,n;
+ int ret=0;
for(n=0 ; n HARD_SERVER_LIMIT ; ++n)
if(scoreboard_image-servers[n].status != SERVER_DEAD
waitpid(scoreboard_image-servers[n].pid,status,WNOHANG) == -1
errno == ECHILD)
{
+ sync_scoreboard_image();
update_child_status(n,SERVER_DEAD,NULL);
+ ret=1;
}
+ return ret;
}
#endif
***
*** 968,973
--- 983,989
static int wait_or_timeout(int *status)
{
+ #ifndef NEED_WAITPID
int ret;
ret=waitpid(-1,status,WNOHANG);
***
*** 977,982
--- 993,1003
return -1;
}
return ret;
+ #else
+ if(!reap_children())
+ sleep(1);
+ return -1;
+ #endif
}
#else
1.7 +1 -0 apache/src/http_main.h
Index: http_main.h
===
RCS file: /export/home/cvs/apache/src/http_main.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C3 -r1.6 -r1.7
*** http_main.h 1996/12/01 20:28:28 1.6
--- http_main.h 1996/12/15 15:09:34 1.7
***
*** 86,91
--- 86,92
*/
void hard_timeout (char *, request_rec *);
+ void keepalive_timeout (char *, request_rec *);
void soft_timeout (char *, request_rec *);
void kill_timeout (request_rec *);
void reset_timeout (request_rec *);
1.83 +1 -1 apache/src/http_protocol.c
Index: http_protocol.c
===
RCS file: /export/home/cvs/apache/src/http_protocol.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -C3 -r1.82 -r1.83
*** http_protocol.c 1996/12/12 00:27:59 1.82
--- http_protocol.c 1996/12/15 15:09:35 1.83
***
*** 652,658
/* Get the request... */
! hard_timeout (read, r);
if (!read_request_line (r)) return NULL;
if (!r-assbackwards)
cvs commit: apache/src CHANGES util_script.c
ben 96/12/28 10:16:11
Modified:src CHANGES util_script.c
Log:
Make create_argv() safe from overflows.
Revision ChangesPath
1.106 +2 -1 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.105
retrieving revision 1.106
diff -C3 -r1.105 -r1.106
*** CHANGES 1996/12/28 00:13:19 1.105
--- CHANGES 1996/12/28 18:16:09 1.106
***
*** 72,78
using the -make flag. [Rob Hartill]
*) Fix coredump triggered when sending a SIGHUP to the server caused
! by a dereference of an unitialized pointer in the listen_rec.
[Ben Laurie]
*) Add FILEPATH_INFO variable to CGI environment, which is equal to
--- 72,79
using the -make flag. [Rob Hartill]
*) Fix coredump triggered when sending a SIGHUP to the server caused
! by an assertion failure, in turn caused by an uninitialised field in a
! listen_rec.
[Ben Laurie]
*) Add FILEPATH_INFO variable to CGI environment, which is equal to
1.35 +2 -0 apache/src/util_script.c
Index: util_script.c
===
RCS file: /export/home/cvs/apache/src/util_script.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -C3 -r1.34 -r1.35
*** util_script.c 1996/12/26 19:07:05 1.34
--- util_script.c 1996/12/28 18:16:10 1.35
***
*** 60,65
--- 60,66
#include http_core.h /* For document_root. Sigh... */
#include http_request.h /* for sub_req_lookup_uri() */
#include util_script.h
+ #include assert.h
/*
* Various utility functions which are common to a whole lot of
***
*** 96,101
--- 97,103
while ((t = strtok(NULL, +)) != NULL) {
unescape_url(t);
+ assert(idx APACHE_ARG_MAX);
av[idx] = escape_shell_cmd(r-pool, t);
av[idx] = t;
idx++;
cvs commit: apache/src CHANGES
ben 96/12/28 10:17:16 Modified:src CHANGES Log: Spelling mistake. Revision ChangesPath 1.107 +1 -1 apache/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.106 retrieving revision 1.107 diff -C3 -r1.106 -r1.107 *** CHANGES 1996/12/28 18:16:09 1.106 --- CHANGES 1996/12/28 18:17:15 1.107 *** *** 33,39 *) Add changes to improve the error message given for invalid ServerName parameters. [Dirk vanGulik] ! *) Add Authoratative directive for Auth modules that don't currently have it. This gives admin control to assign authoritative control to an authentication scheme and allow fall through for those authentication modules that aren't Authoritative thereby --- 33,39 *) Add changes to improve the error message given for invalid ServerName parameters. [Dirk vanGulik] ! *) Add Authoritative directive for Auth modules that don't currently have it. This gives admin control to assign authoritative control to an authentication scheme and allow fall through for those authentication modules that aren't Authoritative thereby
cvs commit: apache/src http_config.c http_config.h http_request.c mod_browser.c
ben 97/01/04 07:10:19
Modified:src http_config.c http_config.h http_request.c
mod_browser.c
Log:
Experimental Header Parse API.
Revision ChangesPath
1.40 +4 -0 apache/src/http_config.c
Index: http_config.c
===
RCS file: /export/home/cvs/apache/src/http_config.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -C3 -r1.39 -r1.40
*** http_config.c 1997/01/01 18:10:16 1.39
--- http_config.c 1997/01/04 15:10:15 1.40
***
*** 292,297
--- 292,301
return run_method (r, XtOffsetOf (module, logger), 1);
}
+ int header_parse (request_rec *r) {
+ return run_method (r, XtOffsetOf (module, header_parser), 1);
+ }
+
/* Auth stuff --- anything that defines one of these will presumably
* want to define something for the other. Note that check_auth is
* separate from check_access to make catching some config errors easier.
1.27 +3 -1 apache/src/http_config.h
Index: http_config.h
===
RCS file: /export/home/cvs/apache/src/http_config.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -C3 -r1.26 -r1.27
*** http_config.h 1997/01/01 18:10:17 1.26
--- http_config.h 1997/01/04 15:10:16 1.27
***
*** 216,221
--- 216,222
int (*type_checker)(request_rec *);
int (*fixer_upper)(request_rec *);
int (*logger)(request_rec *);
+ int (*header_parser)(request_rec *);
} module;
/* Initializer for the first few module slots, which are only
***
*** 225,231
* handle it back-compatibly, or at least signal an error).
*/
! #define MODULE_MAGIC_NUMBER 19961211
#define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL
/* Generic accessors for other modules to get at their own module-specific
--- 226,232
* handle it back-compatibly, or at least signal an error).
*/
! #define MODULE_MAGIC_NUMBER 19970103
#define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL
/* Generic accessors for other modules to get at their own module-specific
***
*** 291,295
--- 292,297
int run_fixups (request_rec *); /* poke around for other metainfo,
etc */
int invoke_handler (request_rec *);
int log_transaction (request_rec *r);
+ int header_parse (request_rec *);
#endif
1.35 +5 -0 apache/src/http_request.c
Index: http_request.c
===
RCS file: /export/home/cvs/apache/src/http_request.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -C3 -r1.34 -r1.35
*** http_request.c1997/01/01 18:10:22 1.34
--- http_request.c1997/01/04 15:10:16 1.35
***
*** 867,872
--- 867,877
die (access_status, r);
return;
}
+
+ if ((access_status = header_parse (r))) {
+ die (access_status, r);
+ return;
+ }
switch (satisfies(r)) {
case SATISFY_ALL:
1.7 +3 -2 apache/src/mod_browser.c
Index: mod_browser.c
===
RCS file: /export/home/cvs/apache/src/mod_browser.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C3 -r1.6 -r1.7
*** mod_browser.c 1997/01/01 18:10:29 1.6
--- mod_browser.c 1997/01/04 15:10:17 1.7
***
*** 138,144
{ NULL },
};
! int fixup_browser_module(request_rec *r)
{
server_rec *s = r-server;
browser_server_config_rec *sconf = get_module_config (s-module_config,
--- 138,144
{ NULL },
};
! int parse_headers_browser_module(request_rec *r)
{
server_rec *s = r-server;
browser_server_config_rec *sconf = get_module_config (s-module_config,
***
*** 182,187
NULL,/* check auth */
NULL,/* check access */
NULL,/* type_checker */
!fixup_browser_module,/* fixups */
NULL,/* logger */
};
--- 182,188
NULL,/* check auth */
NULL,/* check access */
NULL,/* type_checker */
!NULL,/* fixups */
NULL,/* logger */
+parse_headers_browser_module,/* header parser */
};
cvs commit: apache/src/helpers PrintPath
ben 97/01/19 09:43:31
Modified:src Configure alloc.c http_main.c
src/helpers PrintPath
Log:
Make use of -x or -r in [] per-platform.
Revision ChangesPath
1.71 +5 -0 apache/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.70
retrieving revision 1.71
diff -C3 -r1.70 -r1.71
*** Configure 1997/01/10 13:23:30 1.70
--- Configure 1997/01/19 17:43:27 1.71
***
*** 17,22
--- 17,23
file=Configuration
tmpfile=htconf.$$
makefile_tmpl=Makefile.tmpl
+ CONF_TEST_EXECUTABLE=-x
while [ x$1 != x ]; do
if [ x$1 = x-file ] ; then
***
*** 358,363
--- 359,365
OS='ULTRIX'
CFLAGS=-DULTRIX
DEF_WANTHSREGEX=yes
+ CONF_TEST_EXECUTABLE=-r
;;
*powerpc-tenon-machten*)
OS='MachTen'
***
*** 394,399
--- 396,403
;;
esac
+ export CONF_TEST_EXECUTABLE
+
#
# See if we need to override WANTHSREGEX
#
***
*** 426,431
--- 430,436
# then we look for some popular compilers in our $PATH
# and set a safe optimization level
#
+
for compilers in gcc cc acc c89
do
lookedfor=$lookedfor $compilers
1.22 +0 -1 apache/src/alloc.c
Index: alloc.c
===
RCS file: /export/home/cvs/apache/src/alloc.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C3 -r1.21 -r1.22
*** alloc.c 1997/01/01 18:10:13 1.21
--- alloc.c 1997/01/19 17:43:27 1.22
***
*** 189,195
while (blok != NULL) {
if (min_size = blok-h.endp - blok-h.first_avail) {
-
*lastptr = blok-h.next;
blok-h.next = NULL;
return blok;
--- 189,194
1.107 +3 -3 apache/src/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache/src/http_main.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -C3 -r1.106 -r1.107
*** http_main.c 1997/01/12 20:38:12 1.106
--- http_main.c 1997/01/19 17:43:28 1.107
***
*** 1417,1423
s-server_hostname = pstrdup (pconf, (char *)h-h_name);
else
{
! fprintf(stderr,Failed to resolve server name (check
DNS)\n);
exit(0);
}
}
--- 1417,1423
s-server_hostname = pstrdup (pconf, (char *)h-h_name);
else
{
! fprintf(stderr,Failed to resolve server name for %s (check
DNS)\n,inet_ntoa(s-addrs-host_addr));
exit(0);
}
}
***
*** 1635,1641
(struct sockaddr_in *)sa_client,
(struct sockaddr_in *)sa_server,
child_num);
!
r = read_request (current_conn);
(void)update_child_status (child_num, SERVER_BUSY_WRITE, r);
if (r) process_request (r); /* else premature EOF --- ignore */
--- 1635,1641
(struct sockaddr_in *)sa_client,
(struct sockaddr_in *)sa_server,
child_num);
!
r = read_request (current_conn);
(void)update_child_status (child_num, SERVER_BUSY_WRITE, r);
if (r) process_request (r); /* else premature EOF --- ignore */
***
*** 2018,2024
init_alloc();
pconf = permanent_pool;
ptrans = make_sub_pool(pconf);
!
server_argv0 = argv[0];
strcpy (server_root, HTTPD_ROOT);
strcpy (server_confname, SERVER_CONFIG_FILE);
--- 2018,2024
init_alloc();
pconf = permanent_pool;
ptrans = make_sub_pool(pconf);
!
server_argv0 = argv[0];
strcpy (server_root, HTTPD_ROOT);
strcpy (server_confname, SERVER_CONFIG_FILE);
1.6 +2 -1 apache/src/helpers/PrintPath
Index: PrintPath
===
RCS file: /export/home/cvs/apache/src/helpers/PrintPath,v
retrieving revision 1.5
retrieving revision 1.6
diff -C3 -r1.5 -r1.6
*** PrintPath 1997/01/06 18:10:23 1.5
--- PrintPath 1997/01/19 17:43:31 1.6
***
*** 3,8
--- 3,9
# will print out the full pathname unless
# called with the '-s' option
#
+
if [ x$1 = x-s ]; then
shift
else
***
cvs commit: apache/src buff.c
ben 97/02/15 10:34:28 Modified:src buff.c Log: Fix warning. Revision ChangesPath 1.19 +2 -1 apache/src/buff.c Index: buff.c === RCS file: /export/home/cvs/apache/src/buff.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C3 -r1.18 -r1.19 *** buff.c1997/02/10 21:22:19 1.18 --- buff.c1997/02/15 18:34:27 1.19 *** *** 239,245 } /* we know this will fit because of how we wrote it in start_chunk() */ ! i = ap_snprintf( fb-outbase[fb-outchunk], fb-outchunk_header_size, %x, fb-outcnt - fb-outchunk - fb-outchunk_header_size ); /* we may have to tack some trailing spaces onto the number we just wrote --- 239,246 } /* we know this will fit because of how we wrote it in start_chunk() */ ! i = ap_snprintf( (char *)fb-outbase[fb-outchunk], ! fb-outchunk_header_size, %x, fb-outcnt - fb-outchunk - fb-outchunk_header_size ); /* we may have to tack some trailing spaces onto the number we just wrote
cvs commit: apache/src mod_cgi.c
ben 97/02/17 10:11:04
Modified:src mod_cgi.c
Log:
Check for NULL pointer.
Reviewed by: Randy, Jim, Chuck
Revision ChangesPath
1.33 +2 -2 apache/src/mod_cgi.c
Index: mod_cgi.c
===
RCS file: /export/home/cvs/apache/src/mod_cgi.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -C3 -r1.32 -r1.33
*** mod_cgi.c 1997/02/11 17:02:03 1.32
--- mod_cgi.c 1997/02/17 18:11:03 1.33
***
*** 216,222
fprintf(f, %s: %s\n, hdrs[i].key, hdrs[i].val);
}
if ((r-method_number == M_POST || r-method_number == M_PUT)
! *dbuf) {
fprintf(f, \n%s\n, dbuf);
}
--- 216,222
fprintf(f, %s: %s\n, hdrs[i].key, hdrs[i].val);
}
if ((r-method_number == M_POST || r-method_number == M_PUT)
! dbuf *dbuf) {
fprintf(f, \n%s\n, dbuf);
}
***
*** 312,318
#ifndef __EMX__
if (nph) client_to_stdout (r-connection);
#endif
!
/* Transumute outselves into the script.
* NB only ISINDEX scripts get decoded arguments.
*/
--- 312,318
#ifndef __EMX__
if (nph) client_to_stdout (r-connection);
#endif
!
/* Transumute outselves into the script.
* NB only ISINDEX scripts get decoded arguments.
*/
cvs commit: apache/src buff.c
ben 97/02/21 09:12:49
Modified:src buff.c
Log:
Don't note -ve fds for cleanup.
Reviewed by: Randy, Chuck, Marc
Revision ChangesPath
1.21 +3 -2 apache/src/buff.c
Index: buff.c
===
RCS file: /export/home/cvs/apache/src/buff.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C3 -r1.20 -r1.21
*** buff.c1997/02/17 11:05:01 1.20
--- buff.c1997/02/21 17:12:49 1.21
***
*** 149,156
{
fb-fd = fd_out;
fb-fd_in = fd_in;
! note_cleanups_for_fd(fb-pool,fb-fd);
! if(fb-fd != fb-fd_in)
note_cleanups_for_fd(fb-pool,fb-fd_in);
}
--- 149,157
{
fb-fd = fd_out;
fb-fd_in = fd_in;
! if(fb-fd = 0)
! note_cleanups_for_fd(fb-pool,fb-fd);
! if(fb-fd != fb-fd_in fb-fd_in = 0)
note_cleanups_for_fd(fb-pool,fb-fd_in);
}
cvs commit: apache/htdocs/manual env.html index.html
ben 97/02/22 09:22:33 Modified:htdocs/manual index.html Added: htdocs/manual env.html Log: Add documentation for nokeepalive and force-response-1.0. Revision ChangesPath 1.8 +1 -0 apache/htdocs/manual/index.html Index: index.html === RCS file: /export/home/cvs/apache/htdocs/manual/index.html,v retrieving revision 1.7 retrieving revision 1.8 diff -C3 -r1.7 -r1.8 *** index.html1997/01/28 04:23:05 1.7 --- index.html1997/02/22 17:22:32 1.8 *** *** 29,34 --- 29,35 liA HREF=mod/directives.htmlApache run-time configuration directives/A liA HREF=mod/Apache modules/A liA HREF=handler.htmlApache's handler use/A + liA HREF=env.htmlSpecial purpose environment variables/A LIA HREF=misc/API.htmlHighly generalized API to server functionality/A LIA HREF=suexec.htmlUsing SetUserID Execution for CGI/A /ul
cvs commit: apache/htdocs/manual/misc FAQ.html
ben 97/04/09 05:53:52 Modified:htdocs/manual/misc FAQ.html Log: Just testing whether only rodent's have problems... Revision ChangesPath 1.13 +2 -2 apache/htdocs/manual/misc/FAQ.html Index: FAQ.html === RCS file: /export/home/cvs/apache/htdocs/manual/misc/FAQ.html,v retrieving revision 1.12 retrieving revision 1.13 diff -C3 -r1.12 -r1.13 *** FAQ.html 1997/04/09 11:59:17 1.12 --- FAQ.html 1997/04/09 12:53:50 1.13 *** *** 1,14 !DOCTYPE HTML PUBLIC -//IETF//DTD HTML 2.0//EN HTML HEAD ! TITLEApache Server Frequently Asked Questions/TITLE /HEAD BODY !--#include virtual=header.html -- H1Apache Server Frequently Asked Questions/H1 P ! $Revision: 1.12 $ ($Date: 1997/04/09 11:59:17 $) /P H2The Questions/H2 !-- Stuff to Add: -- --- 1,14 !DOCTYPE HTML PUBLIC -//IETF//DTD HTML 2.0//EN HTML HEAD ! TITLEApache Server Frequently Asked Questions/TITLE /HEAD BODY !--#include virtual=header.html -- H1Apache Server Frequently Asked Questions/H1 P ! $Revision: 1.13 $ ($Date: 1997/04/09 12:53:50 $) /P H2The Questions/H2 !-- Stuff to Add: --
cvs commit: apache/src/modules Makefile
ben 97/04/26 13:20:07 Modified:src conf.h http_main.h src/modules Makefile Log: Fix multiply defined signal(). Reviewed by: Randy, Dean. Revision ChangesPath 1.94 +14 -0 apache/src/conf.h Index: conf.h === RCS file: /export/home/cvs/apache/src/conf.h,v retrieving revision 1.93 retrieving revision 1.94 diff -C3 -r1.93 -r1.94 *** conf.h1997/04/15 20:00:21 1.93 --- conf.h1997/04/26 20:20:06 1.94 *** *** 639,644 --- 639,658 #define INADDR_NONE ((unsigned long) -1) #endif + /* + * Replace signal function with sigaction equivalent + */ + #ifndef NO_USE_SIGACTION + typedef void Sigfunc(int); + + #if defined(SIG_IGN) !defined(SIG_ERR) + #define SIG_ERR ((Sigfunc *)-1) + #endif + + #define signal(s,f) ap_signal(s,f) + Sigfunc *signal(int signo, Sigfunc *func); + #endif + /* Finding offsets of elements within structures. * Taken from the X code... they've sweated portability of this stuff * so we don't have to. Sigh... 1.10 +0 -13 apache/src/http_main.h Index: http_main.h === RCS file: /export/home/cvs/apache/src/http_main.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C3 -r1.9 -r1.10 *** http_main.h 1997/04/21 20:29:07 1.9 --- http_main.h 1997/04/26 20:20:06 1.10 *** *** 97,112 int count_busy_servers (); int count_idle_servers (); - /* - * Replace signal function with sigaction equivalent - */ - #ifndef NO_USE_SIGACTION - typedef void Sigfunc(int); - - #if defined(SIG_IGN) !defined(SIG_ERR) - #define SIG_ERR ((Sigfunc *)-1) - #endif - - Sigfunc *signal(int signo, Sigfunc *func); - #endif - --- 97,99 1.9 +24 -65apache/src/modules/Attic/Makefile
cvs commit: apache/src conf.h
ben 97/06/04 00:03:12 Modified:src conf.h Log: SCO3 doesn't have writev. Revision ChangesPath 1.99 +1 -0 apache/src/conf.h Index: conf.h === RCS file: /export/home/cvs/apache/src/conf.h,v retrieving revision 1.98 retrieving revision 1.99 diff -C3 -r1.98 -r1.99 *** conf.h1997/05/29 04:50:26 1.98 --- conf.h1997/06/04 07:03:11 1.99 *** *** 271,276 --- 271,277 #undef NO_KILLPG #undef NO_SETSID #define NEED_INITGROUPS + #define NO_WRITEV #define JMP_BUF sigjmp_buf #define SIGURG SIGUSR1 /* but note, this signal will be sent to a process group if enabled (for OOB data). It is not currently enabled. */ #include sys/time.h
cvs commit: apache/src/modules Makefile
ben 97/06/04 00:03:40 Modified:src/modules Makefile Added: . KEYS Log: Add PGP public keys file. Revision ChangesPath 1.10 +2 -8 apache/src/modules/Attic/Makefile Index: Makefile === RCS file: /export/home/cvs/apache/src/modules/Attic/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -C3 -r1.9 -r1.10 *** Makefile 1997/04/26 20:20:07 1.9 --- Makefile 1997/06/04 07:03:40 1.10 *** *** 7,14 SHELL=/bin/sh INCLUDES2= MOD_CFLAGS=$(INCLUDES2) $(AUX_CFLAGS) ! MODULES=proxy example ! CLEANERS=proxy_clean example_clean default: $(MODULES) @echo Done building module subdirectories --- 7,14 SHELL=/bin/sh INCLUDES2= MOD_CFLAGS=$(INCLUDES2) $(AUX_CFLAGS) ! MODULES= ! CLEANERS= default: $(MODULES) @echo Done building module subdirectories *** *** 20,29 (cd $@; $(MAKE) CC=$(CC) AUX_CFLAGS='$(MOD_CFLAGS)' RANLIB='$(RANLIB)') ForceMe: - - proxy_clean: - (cd proxy; $(MAKE) clean) - - example_clean: - (cd example; $(MAKE) clean) --- 20,23
cvs commit: apache/src/nt - New directory
ben 97/06/15 09:36:49 apache/src/nt - New directory
cvs commit: CVSROOT commit_prep.pl log_accum.pl
ben 97/06/15 12:18:26 Modified:. commit_prep.pl log_accum.pl Log: Nasty hack to get around checkin problem Revision ChangesPath 1.2 +1 -1 CVSROOT/commit_prep.pl Index: commit_prep.pl === RCS file: /export/home/cvs/CVSROOT/commit_prep.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C3 -r1.1 -r1.2 *** commit_prep.pl1996/01/14 16:08:14 1.1 --- commit_prep.pl1997/06/15 19:18:24 1.2 *** *** 43,49 # Constants # ! $LAST_FILE = /tmp/#cvs.lastdir; $ENTRIES = CVS/Entries; $NoId = --- 43,49 # Constants # ! $LAST_FILE = /tmp/##cvs.lastdir; $ENTRIES = CVS/Entries; $NoId = 1.25 +2 -2 CVSROOT/log_accum.pl Index: log_accum.pl === RCS file: /export/home/cvs/CVSROOT/log_accum.pl,v retrieving revision 1.24 retrieving revision 1.25 diff -C3 -r1.24 -r1.25 *** log_accum.pl 1997/06/04 04:43:56 1.24 --- log_accum.pl 1997/06/15 19:18:25 1.25 *** *** 1,6 #!/usr/bin/perl # ! # $Id: log_accum.pl,v 1.24 1997/06/04 04:43:56 brian Exp $ # # Perl filter to handle the log messages from the checkin of files in # a directory. This script will group the lists of files by log --- 1,6 #!/usr/bin/perl # ! # $Id: log_accum.pl,v 1.25 1997/06/15 19:18:25 ben Exp $ # # Perl filter to handle the log messages from the checkin of files in # a directory. This script will group the lists of files by log *** *** 42,48 $STATE_REMOVED = 3; $STATE_LOG = 4; ! $LAST_FILE = /tmp/#cvs.lastdir; $CHANGED_FILE = /tmp/#cvs.files.changed; $ADDED_FILE= /tmp/#cvs.files.added; $REMOVED_FILE = /tmp/#cvs.files.removed; --- 42,48 $STATE_REMOVED = 3; $STATE_LOG = 4; ! $LAST_FILE = /tmp/##cvs.lastdir; $CHANGED_FILE = /tmp/#cvs.files.changed; $ADDED_FILE= /tmp/#cvs.files.added; $REMOVED_FILE = /tmp/#cvs.files.removed;
cvs commit: apache/src CHANGES
ben 97/06/15 23:06:23 Modified:src CHANGES Log: Kick off the 1.3 changes with the NT port. Revision ChangesPath 1.287 +4 -0 apache/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.286 retrieving revision 1.287 diff -C3 -r1.286 -r1.287 *** CHANGES 1997/06/05 09:32:46 1.286 --- CHANGES 1997/06/16 06:06:21 1.287 *** *** 1,3 --- 1,7 + Changes with Apache 1.3 + + *) Added NT support [Ben Laurie and Ambarish Malpani [EMAIL PROTECTED]] + Changes with Apache 1.2 Changes with Apache 1.2b11
cvs commit: apache/src http_main.c
ben 97/06/29 08:17:49
Modified:src http_main.c
Log:
Check error code from accept() on Win32 correctly.
Submitted by: Paul Sutton
Revision ChangesPath
1.167 +1 -1 apache/src/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache/src/http_main.c,v
retrieving revision 1.166
retrieving revision 1.167
diff -C3 -r1.166 -r1.167
*** http_main.c 1997/06/29 00:03:17 1.166
--- http_main.c 1997/06/29 15:17:48 1.167
***
*** 3176,3182
clen = sizeof(sa_client);
csd = accept(sd, (struct sockaddr *)sa_client, clen);
#ifdef WIN32
! if(csd == SOCKET_ERROR)
{
csd = -1;
errno = WSAGetLastError() - WSABASEERR;
--- 3176,3182
clen = sizeof(sa_client);
csd = accept(sd, (struct sockaddr *)sa_client, clen);
#ifdef WIN32
! if(csd == INVALID_SOCKET)
{
csd = -1;
errno = WSAGetLastError() - WSABASEERR;
cvs commit: apache/src http_log.c
ben 97/06/29 08:25:22 Modified:src http_log.c Log: Make assert() exit. Submitted by: Marc Slemko Revision ChangesPath 1.17 +1 -0 apache/src/http_log.c Index: http_log.c === RCS file: /export/home/cvs/apache/src/http_log.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C3 -r1.16 -r1.17 *** http_log.c1997/06/29 00:05:12 1.16 --- http_log.c1997/06/29 15:25:21 1.17 *** *** 213,216 --- 213,217 ap_snprintf(buf, sizeof(buf), line %d, assertion \%s\ failed,nLine,szExp); log_unixerr(assert,szFile,buf,NULL); + exit(1); }
cvs commit: apache/src util.c
ben 97/06/29 10:27:01
Modified:src util.c
Log:
Fix VC++ warnings
Revision ChangesPath
1.58 +6 -5 apache/src/util.c
Index: util.c
===
RCS file: /export/home/cvs/apache/src/util.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -C3 -r1.57 -r1.58
*** util.c1997/06/28 22:39:23 1.57
--- util.c1997/06/29 17:26:59 1.58
***
*** 211,217
const char *src = input;
char *dest, *dst;
char c;
! int no, len;
if (!source) return NULL;
if (!nmatch) return pstrdup(p, src);
--- 211,218
const char *src = input;
char *dest, *dst;
char c;
! size_t no;
! int len;
if (!source) return NULL;
if (!nmatch) return pstrdup(p, src);
***
*** 226,234
else if (c == '$' isdigit(*src))
no = *src++ - '0';
else
! no = -1;
! if (no 0) { /* Ordinary character. */
if (c == '\\' (*src == '$' || *src == ''))
c = *src++;
len++;
--- 227,235
else if (c == '$' isdigit(*src))
no = *src++ - '0';
else
! no = 10;
! if (no 9) { /* Ordinary character. */
if (c == '\\' (*src == '$' || *src == ''))
c = *src++;
len++;
***
*** 250,258
else if (c == '$' isdigit(*src))
no = *src++ - '0';
else
! no = -1;
! if (no 0) { /* Ordinary character. */
if (c == '\\' (*src == '$' || *src == ''))
c = *src++;
*dst++ = c;
--- 251,259
else if (c == '$' isdigit(*src))
no = *src++ - '0';
else
! no = 10;
! if (no 9) { /* Ordinary character. */
if (c == '\\' (*src == '$' || *src == ''))
c = *src++;
*dst++ = c;
cvs commit: apache/src http_core.c
ben 97/06/29 10:29:18
Modified:src http_core.c
Log:
Fix warnings in VC++.
Revision ChangesPath
1.88 +2 -2 apache/src/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apache/src/http_core.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -C3 -r1.87 -r1.88
*** http_core.c 1997/06/28 23:57:55 1.87
--- http_core.c 1997/06/29 17:29:17 1.88
***
*** 506,512
const char *set_options (cmd_parms *cmd, core_dir_config *d, const char *l)
{
! char opt;
int first = 1;
char action;
--- 506,512
const char *set_options (cmd_parms *cmd, core_dir_config *d, const char *l)
{
! unsigned char opt;
int first = 1;
char action;
***
*** 1145,1151
{
listen_rec *new;
char *ports;
! unsigned port;
if (cmd-server-is_virtual) return Listen not allowed in
VirtualHost;
ports=strchr(ips, ':');
--- 1145,1151
{
listen_rec *new;
char *ports;
! unsigned short port;
if (cmd-server-is_virtual) return Listen not allowed in
VirtualHost;
ports=strchr(ips, ':');
cvs commit: apache/src mod_imap.c
ben 97/06/29 10:34:35
Modified:src mod_imap.c
Log:
Fix VC++ warnings.
Revision ChangesPath
1.22 +1 -1 apache/src/mod_imap.c
Index: mod_imap.c
===
RCS file: /export/home/cvs/apache/src/mod_imap.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C3 -r1.21 -r1.22
*** mod_imap.c1997/04/12 04:24:58 1.21
--- mod_imap.c1997/06/29 17:34:35 1.22
***
*** 181,187
int pointincircle(double point[2], double coords[MAXVERTS][2])
{
! int radius1, radius2;
radius1 = ((coords[0][Y] - coords[1][Y]) * (coords[0][Y] -
coords[1][Y]))
+ ((coords[0][X] - coords[1][X]) * (coords[0][X] - coords[1][X]));
--- 181,187
int pointincircle(double point[2], double coords[MAXVERTS][2])
{
! double radius1, radius2;
radius1 = ((coords[0][Y] - coords[1][Y]) * (coords[0][Y] -
coords[1][Y]))
+ ((coords[0][X] - coords[1][X]) * (coords[0][X] - coords[1][X]));
cvs commit: apache/src mod_cgi.c
ben 97/06/29 10:39:51 Modified:src mod_cgi.c Log: Fix VC++ warnings. Revision ChangesPath 1.42 +2 -0 apache/src/mod_cgi.c Index: mod_cgi.c === RCS file: /export/home/cvs/apache/src/mod_cgi.c,v retrieving revision 1.41 retrieving revision 1.42 diff -C3 -r1.41 -r1.42 *** mod_cgi.c 1997/06/22 03:40:24 1.41 --- mod_cgi.c 1997/06/29 17:39:50 1.42 *** *** 291,297 --- 291,299 #endif char **env; + #ifndef WIN32 char err_string[HUGE_STRING_LEN]; + #endif #ifdef DEBUG_CGI fprintf (dbg, Attempting to exec %s as %sCGI child (argv0 = %s)\n,
cvs commit: apache/src http_protocol.c
ben 97/06/29 10:43:55 Modified:src http_protocol.c Log: Fix VC++ warnings. Revision ChangesPath 1.128 +1 -1 apache/src/http_protocol.c Index: http_protocol.c === RCS file: /export/home/cvs/apache/src/http_protocol.c,v retrieving revision 1.127 retrieving revision 1.128 diff -C3 -r1.127 -r1.128 *** http_protocol.c 1997/06/15 19:22:27 1.127 --- http_protocol.c 1997/06/29 17:43:54 1.128 *** *** 505,511 #if defined(__EMX__) || defined(WIN32) /* Variable for OS/2 fix below. */ ! int loop; #endif /* A proxy request contains a ':' early on, but not as first character */ --- 505,511 #if defined(__EMX__) || defined(WIN32) /* Variable for OS/2 fix below. */ ! size_t loop; #endif /* A proxy request contains a ':' early on, but not as first character */
cvs commit: apache/src util_snprintf.c
ben 97/06/29 10:49:02
Modified:src util_snprintf.c
Log:
Fix VC++ warnings.
Revision ChangesPath
1.6 +1 -1 apache/src/util_snprintf.c
Index: util_snprintf.c
===
RCS file: /export/home/cvs/apache/src/util_snprintf.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C3 -r1.5 -r1.6
*** util_snprintf.c 1997/02/08 01:33:56 1.5
--- util_snprintf.c 1997/06/29 17:49:02 1.6
***
*** 390,396
do {
register u_wide_int new_magnitude = magnitude / 10;
! *--p = magnitude - new_magnitude * 10 + '0';
magnitude = new_magnitude;
}
while (magnitude);
--- 390,396
do {
register u_wide_int new_magnitude = magnitude / 10;
! *--p = (char)(magnitude - new_magnitude * 10 + '0');
magnitude = new_magnitude;
}
while (magnitude);
cvs commit: apache/src apache.mak http_main.c
ben 97/06/29 11:25:57
Modified:src apache.mak http_main.c
Log:
Remove unused variable.
Revision ChangesPath
1.3 +50 -266 apache/src/apache.mak
Index: apache.mak
===
RCS file: /export/home/cvs/apache/src/apache.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -C3 -r1.2 -r1.3
*** apache.mak1997/06/28 22:39:19 1.2
--- apache.mak1997/06/29 18:25:54 1.3
***
*** 34,41
# Begin Project
# PROP Target_Last_Scanned apache - Win32 Debug
- RSC=rc.exe
CPP=cl.exe
!IF $(CFG) == apache - Win32 Release
--- 34,41
# Begin Project
# PROP Target_Last_Scanned apache - Win32 Debug
CPP=cl.exe
+ RSC=rc.exe
!IF $(CFG) == apache - Win32 Release
***
*** 854,860
--- 854,862
!IF $(CFG) == apache - Win32 Release
DEP_CPP_UTIL_=\
+ .\./regex\regex.h\
.\conf.h\
+ {$(INCLUDE)}\sys\STAT.H\
{$(INCLUDE)}\sys\TYPES.H\
***
*** 878,884
--- 880,888
!ELSEIF $(CFG) == apache - Win32 Pre
DEP_CPP_UTIL_=\
+ .\./regex\regex.h\
.\conf.h\
+ {$(INCLUDE)}\sys\STAT.H\
{$(INCLUDE)}\sys\TYPES.H\
***
*** 908,916
# Begin Source File
SOURCE=.\buff.c
-
- !IF $(CFG) == apache - Win32 Release
-
DEP_CPP_BUFF_=\
.\./regex\regex.h\
.\alloc.h\
--- 912,917
***
*** 922,942
{$(INCLUDE)}\sys\TYPES.H\
$(INTDIR)\buff.obj : $(SOURCE) $(DEP_CPP_BUFF_) $(INTDIR)
!ELSEIF $(CFG) == apache - Win32 Debug
- DEP_CPP_BUFF_=\
- .\./regex\regex.h\
- .\alloc.h\
- .\buff.h\
- .\conf.h\
- .\http_main.h\
- .\httpd.h\
- {$(INCLUDE)}\sys\STAT.H\
- {$(INCLUDE)}\sys\TYPES.H\
-
$(INTDIR)\buff.obj : $(SOURCE) $(DEP_CPP_BUFF_) $(INTDIR)
--- 923,936
{$(INCLUDE)}\sys\TYPES.H\
+ !IF $(CFG) == apache - Win32 Release
+
+
$(INTDIR)\buff.obj : $(SOURCE) $(DEP_CPP_BUFF_) $(INTDIR)
!ELSEIF $(CFG) == apache - Win32 Debug
$(INTDIR)\buff.obj : $(SOURCE) $(DEP_CPP_BUFF_) $(INTDIR)
***
*** 945,960
!ELSEIF $(CFG) == apache - Win32 Pre
- DEP_CPP_BUFF_=\
- .\./regex\regex.h\
- .\alloc.h\
- .\buff.h\
- .\conf.h\
- .\http_main.h\
- .\httpd.h\
- {$(INCLUDE)}\sys\STAT.H\
- {$(INCLUDE)}\sys\TYPES.H\
-
$(INTDIR)\buff.obj : $(SOURCE) $(DEP_CPP_BUFF_) $(INTDIR)
--- 939,944
***
*** 963,978
!ELSEIF $(CFG) == apache - Win32 Profile
- DEP_CPP_BUFF_=\
- .\./regex\regex.h\
- .\alloc.h\
- .\buff.h\
- .\conf.h\
- .\http_main.h\
- .\httpd.h\
- {$(INCLUDE)}\sys\STAT.H\
- {$(INCLUDE)}\sys\TYPES.H\
-
$(INTDIR)\buff.obj : $(SOURCE) $(DEP_CPP_BUFF_) $(INTDIR)
--- 947,952
***
*** 1162,1171
!ELSEIF $(CFG) == apache - Win32 Profile
DEP_CPP_HTTP_C=\
- .\./regex\regex.h\
- .\alloc.h\
- .\buff.h\
- .\conf.h\
.\explain.h\
.\http_conf_globals.h\
.\http_config.h\
--- 1136,1141
***
*** 1173,1180
.\http_log.h\
.\http_request.h\
.\httpd.h\
- {$(INCLUDE)}\sys\STAT.H\
- {$(INCLUDE)}\sys\TYPES.H\
$(INTDIR)\http_config.obj : $(SOURCE) $(DEP_CPP_HTTP_C) $(INTDIR)
--- 1143,1148
***
*** 1290,1295
--- 1258,1266
{$(INCLUDE)}\sys\STAT.H\
{$(INCLUDE)}\sys\TYPES.H\
+ NODEP_CPP_HTTP_CO=\
+ .\sin_port\
+
$(INTDIR)\http_core.obj : $(SOURCE) $(DEP_CPP_HTTP_CO) $(INTDIR)
***
*** 1325,1330
--- 1296,1302
!ELSEIF $(CFG) == apache - Win32 Debug
DEP_CPP_HTTP_L=\
+ .\./regex\regex.h\
.\alloc.h\
.\buff.h\
.\conf.h\
***
*** 1332,1337
--- 1304,1311
.\http_core.h\
.\http_log.h\
.\httpd.h\
+ {$(INCLUDE)}\sys\STAT.H\
+ {$(INCLUDE)}\sys\TYPES.H\
$(INTDIR)\http_log.obj : $(SOURCE) $(DEP_CPP_HTTP_L) $(INTDIR)
***
*** 1342,1347
--- 1316,1322
!ELSEIF $(CFG) == apache - Win32 Pre
DEP_CPP_HTTP_L=\
+ .\./regex\regex.h\
.\alloc.h\
.\buff.h\
.\conf.h\
***
*** 1349,1354
--- 1324,1331
.\http_core.h\
cvs commit: apache/src/nt service.c
ben 97/06/29 11:32:00 Modified:src/ntservice.c Log: Make sure create_event gets defined. Revision ChangesPath 1.2 +1 -0 apache/src/nt/service.c Index: service.c === RCS file: /export/home/cvs/apache/src/nt/service.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C3 -r1.1 -r1.2 *** service.c 1997/06/15 19:22:53 1.1 --- service.c 1997/06/29 18:32:00 1.2 *** *** 7,12 --- 7,13 #include process.h #include direct.h + #include ../conf.h #include ../multithread.h #include service.h
