cvs commit: apache-devsite footer.html header.html index.html
coar97/06/27 23:36:24 Added: . footer.html header.html index.html Log: Add a front page to the Dev.Apache.Org area. Revision ChangesPath 1.1 apache-devsite/footer.html Index: footer.html === HR 1.1 apache-devsite/header.html Index: header.html === DIV ALIGN=CENTER IMG SRC=images/apache_logo.gif ALT=[APACHE] /DIV 1.1 apache-devsite/index.html Index: index.html === !DOCTYPE HTML PUBLIC -//W3C//DTD HTML 3.2 Final//EN HTML HEAD TITLEApache Project Development Site/TITLE /HEAD !-- Background white, links blue (unvisited), navy (visited), red (active) -- BODY BGCOLOR=#FF TEXT=#00 LINK=#FF VLINK=#80 ALINK=#FF !--#include virtual=header.html -- H1 ALIGN=CENTERSAMPDev.Apache.Org/SAMP - Developer Resources/H1 P This site includes many of the reference materials used by The Apache Group in their development efforts. /P UL TYPE=CIRCLE LIDeveloper access to the A HREF=http://dev.apache.org/private/bugdb.cgi; bug database/A /LI LIThe latest draft of the A HREF=project-plan Apache project plan/A /LI LIRules and information about A HREF=voting voting/A /LI LIThe Apache coding A HREF=styleguide style guide/A /LI LISome notes on A HREF=API.html the API/A /LI /UL !--#include virtual=footer.html -- /BODY /HTML
cvs commit: apache-devsite index.html
coar97/06/28 01:22:30 Modified:. index.html Log: Add some references missed in the first pass. Revision ChangesPath 1.2 +38 -1 apache-devsite/index.html Index: index.html === RCS file: /export/home/cvs/apache-devsite/index.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C3 -r1.1 -r1.2 *** index.html1997/06/28 06:36:23 1.1 --- index.html1997/06/28 08:22:29 1.2 *** *** 17,32 --- 17,43 This site includes many of the reference materials used by The Apache Group in their development efforts. /P + BLOCKQUOTE +Note that a lot of these documents may not be entirely up-to-date. +Some may have been superseded by other references, and some may just +be waiting for someone to get around to updating them. + /BLOCKQUOTE UL TYPE=CIRCLE LIDeveloper access to the A HREF=http://dev.apache.org/private/bugdb.cgi; bug database/A /LI +LIArchives of the + A + HREF=mail/ + mailing lists/A +/LI LIThe latest draft of the A HREF=project-plan Apache project plan/A + (last modified on !--#flastmod virtual=project-plan.html --) /LI LIRules and information about A *** *** 37,47 A HREF=styleguide style guide/A /LI LISome notes on A ! HREF=API.html the API/A /LI /UL !--#include virtual=footer.html -- --- 48,84 A HREF=styleguide style guide/A + (last modified on !--#flastmod virtual=styleguide.html --) /LI LISome notes on A ! HREF=API the API/A + (last modified on !--#flastmod virtual=API.html --) +/LI +LIHow to + A + HREF=binaries + build binary distributions/A + (last modified on !--#flastmod virtual=binaries.html --) +/LI +LIInstructions for constructing + A + HREF=how-to-release + distribution kit/A + (last modified on !--#flastmod virtual=how-to-release.html --) +/LI +LIRecord of changes to the + A + HREF=mmn + module magic number/A + (last modified on !--#flastmod virtual=mmn.txt --) +/LI +LIThe + A + HREF=todo + to-do list/A + (last modified on !--#flastmod virtual=todo.html --) /LI /UL !--#include virtual=footer.html --
cvs commit: apache-devsite project-plan-new.html
coar97/06/28 01:33:50 Removed: . project-plan-new.html Log: Nuking the separate file containing Brian's edits; the original can be recovered from CVS now.
cvs commit: apache-site/dyn closer.cgi
marc97/06/28 10:11:00
Modified:dyn closer.cgi
Log:
Fix a broken URL; the change was missed when the directory structure
was changed.
Revision ChangesPath
1.4 +1 -1 apache-site/dyn/closer.cgi
Index: closer.cgi
===
RCS file: /export/home/cvs/apache-site/dyn/closer.cgi,v
retrieving revision 1.3
retrieving revision 1.4
diff -C3 -r1.3 -r1.4
*** closer.cgi1997/06/14 20:39:47 1.3
--- closer.cgi1997/06/28 17:11:00 1.4
***
*** 114,119
else
{
print EOF;
! A HREF=list.cgiSee full listing of download sites/A
EOF
}
--- 114,119
else
{
print EOF;
! A HREF=../mirrors/See full listing of download sites/A
EOF
}
cvs commit: apache-site in_the_news.html
randy 97/06/28 12:10:41 Modified:. in_the_news.html Log: Wired article on Apache. Revision ChangesPath 1.8 +4 -0 apache-site/in_the_news.html Index: in_the_news.html === RCS file: /export/home/cvs/apache-site/in_the_news.html,v retrieving revision 1.7 retrieving revision 1.8 diff -C3 -r1.7 -r1.8 *** in_the_news.html 1997/06/19 07:15:32 1.7 --- in_the_news.html 1997/06/28 19:10:40 1.8 *** *** 12,17 --- 12,21 hr pb + a href=http://www.wired.com/news/news/wiredview/story/4753.html;Wired, June 28th 1997, Software Wants to Be Free/a/b + brblockquotei + It's no secret that Apache is the most powerful, the most flexible, and the best Web-server software on the market./blockquote/i + pb a href=http://www8.zdnet.com/pcweek/news/0609/09apache.html; PC Week, June 9th 1997, Fort Apache/a/b brblockquotei
cvs commit: apache/src mod_include.c
dgaudet 97/06/28 12:49:39
Modified:src mod_include.c
Log:
PR#742: mod_include was not properly changing directory
Reviewed by: Dean, Brian
Submitted by: Marc
Revision ChangesPath
1.36 +2 -0 apache/src/mod_include.c
Index: mod_include.c
===
RCS file: /export/home/cvs/apache/src/mod_include.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -C3 -r1.35 -r1.36
*** mod_include.c 1997/06/22 03:40:24 1.35
--- mod_include.c 1997/06/28 19:49:38 1.36
***
*** 524,529
--- 524,530
}
destroy_sub_req (rr);
+ chdir_file(r-filename);
return 0;
}
***
*** 571,576
--- 572,578
if (!error_fmt run_sub_req (rr))
error_fmt = unable to include %s in parsed file %s;
+ chdir_file(r-filename);
if (error_fmt) {
log_printf(r-server, error_fmt, tag_val, r-filename);
cvs commit: apache/src mod_include.c
dgaudet 97/06/28 12:50:16
Modified:src Tag: APACHE_1_2_X mod_include.c
Log:
PR#742: mod_include was not properly changing directory
Reviewed by: Dean, Brian
Submitted by: Marc
Revision ChangesPath
No revision
No revision
1.33.2.2 +2 -0 apache/src/mod_include.c
Index: mod_include.c
===
RCS file: /export/home/cvs/apache/src/mod_include.c,v
retrieving revision 1.33.2.1
retrieving revision 1.33.2.2
diff -C3 -r1.33.2.1 -r1.33.2.2
*** mod_include.c 1997/06/27 02:28:55 1.33.2.1
--- mod_include.c 1997/06/28 19:50:15 1.33.2.2
***
*** 520,525
--- 520,526
}
destroy_sub_req (rr);
+ chdir_file(r-filename);
return 0;
}
***
*** 567,572
--- 568,574
if (!error_fmt run_sub_req (rr))
error_fmt = unable to include %s in parsed file %s;
+ chdir_file(r-filename);
if (error_fmt) {
log_printf(r-server, error_fmt, tag_val, r-filename);
cvs commit: apache/src CHANGES
dgaudet 97/06/28 12:53:03 Modified:src CHANGES Log: Update the 1.2.1 changes. Revision ChangesPath 1.298 +46 -43apache/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.297 retrieving revision 1.298 diff -C3 -r1.297 -r1.298 *** CHANGES 1997/06/27 03:19:59 1.297 --- CHANGES 1997/06/28 19:53:02 1.298 *** *** 7,59 *) Added NT support [Ben Laurie and Ambarish Malpani [EMAIL PROTECTED]] Changes with Apache 1.2.1 - - *) Improved unix error response logging. [Marc Slemko] ! *) Update mod_rewrite from 3.0.5 to 3.0.6. New ruleflag ! QSA=query_string_append. Also fixed a nasty bug in per-dir context: ! when a URL http://... was used in concunction with a special ! redirect flag, e.g. R=permanent, the permanent status was lost. ! [Ronald Tschalaer [EMAIL PROTECTED], Ralf S. Engelschall] ! ! *) If an object has multiple variants that are otherwise equal Apache ! would prefer the last listed variant rather than the first. ! [Paul Sutton] PR#94 ! ! *) HostnameLookups now defaults to off because it is far better for ! the net if we require people that actually need this data to ! enable it. [Linus Torvalds] ! ! *) make clean at the top level now removes *.o. [Dean Gaudet] PR#752 ! ! *) Don't serve file system objects unless they are plain files, symlinks, ! or directories. This prevents local users from using pipes or ! named sockets to invoke programs for an extremely crude form of CGI. [Dean Gaudet] ! *) HeaderName and ReadmeName were settable in .htaccess and could ! contain ../ allowing a local user to publish any file on the ! system. No slashes are allowed now. [Dean Gaudet] ! ! *) It was possible to violate the symlink Options using mod_dir (headers, ! readmes, titles), mod_negotiation (type maps), or mod_cern_meta ! (meta files). [Dean Gaudet] ! ! *) Update Unixware support for 2.1.2. [Lawrence Rosenman ler@lerctr.org] ! PR#511 ! ! *) Port to NonStop-UX [Joachim Schmitz [EMAIL PROTECTED]] PR#327 ! *) Update ConvexOS support for 11.5. [David DeSimone [EMAIL PROTECTED]] ! PR#399 ! ! *) Support for dec cc compiler under ultrix. ! [P. Alejandro Lopez-Valencia [EMAIL PROTECTED]] PR#388 ! ! *) Support for Maxion/OS SVR4.2 Real Time Unix. [no name given] PR#383 ! ! *) mod_status dumps core in inetd mode. [Marc Slemko and Roy Fielding] ! PR#566 *) Attempt to work around problems with third party libraries that do not handle high numbered descriptors (examples include bind, and --- 7,32 *) Added NT support [Ben Laurie and Ambarish Malpani [EMAIL PROTECTED]] Changes with Apache 1.2.1 ! *) SECURITY: Don't serve file system objects unless they are plain files, ! symlinks, or directories. This prevents local users from using pipes ! or named sockets to invoke programs for an extremely crude form of CGI. [Dean Gaudet] ! *) SECURITY: HeaderName and ReadmeName were settable in .htaccess and ! could contain ../ allowing a local user to publish any file on ! the system. No slashes are allowed now. [Dean Gaudet] ! ! *) SECURITY: It was possible to violate the symlink Options using mod_dir ! (headers, readmes, titles), mod_negotiation (type maps), or ! mod_cern_meta (meta files). [Dean Gaudet] ! *) CONFIG: HostnameLookups now defaults to off because it is far better ! for the net if we require people that actually need this data to ! enable it. [Linus Torvalds] ! ! *) mod_include was not properly changing the current directory. ! [Marc Slemko] PR#742 *) Attempt to work around problems with third party libraries that do not handle high numbered descriptors (examples include bind, and *** *** 72,78 --- 45,81 directives. But using -DHIGH_SLACK_LINE=256 described above will work around this problem. [Dean Gaudet] + *) Improved unix error response logging. [Marc Slemko] + + *) Update mod_rewrite from 3.0.5 to 3.0.6. New ruleflag + QSA=query_string_append. Also fixed a nasty bug in per-dir context: + when a URL http://... was used in concunction with a special + redirect flag, e.g. R=permanent, the permanent status was lost. + [Ronald Tschalaer [EMAIL PROTECTED], Ralf S. Engelschall] + + *) If an object has multiple variants that are otherwise equal Apache + would prefer the last listed variant rather than the first. + [Paul Sutton] PR#94 + + *) make clean at the top
cvs commit: apache/src CHANGES mod_auth.c
dgaudet 97/06/28 12:55:18
Modified:src CHANGES mod_auth.c
Log:
Deal with extra : delimited fields.
Reviewed by: Dean, Brian
Submitted by: Marc
Revision ChangesPath
1.299 +2 -0 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.298
retrieving revision 1.299
diff -C3 -r1.298 -r1.299
*** CHANGES 1997/06/28 19:53:02 1.298
--- CHANGES 1997/06/28 19:55:16 1.299
***
*** 6,11
--- 6,13
*) Added NT support [Ben Laurie and Ambarish Malpani [EMAIL PROTECTED]]
+ *) mod_auth deals with extra ':' delimited fields. [Marc Slemko]
+
Changes with Apache 1.2.1
*) SECURITY: Don't serve file system objects unless they are plain files,
1.17 +1 -1 apache/src/mod_auth.c
Index: mod_auth.c
===
RCS file: /export/home/cvs/apache/src/mod_auth.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C3 -r1.16 -r1.17
*** mod_auth.c1997/06/17 00:09:13 1.16
--- mod_auth.c1997/06/28 19:55:17 1.17
***
*** 130,136
if(!strcmp(user,w)) {
pfclose(r-pool, f);
! return pstrdup (r-pool, rpw);
}
}
pfclose(r-pool, f);
--- 130,136
if(!strcmp(user,w)) {
pfclose(r-pool, f);
! return getword(r-pool, rpw, ':');
}
}
pfclose(r-pool, f);
cvs commit: apache/src CHANGES http_core.c
dgaudet 97/06/28 13:10:14
Modified:src CHANGES http_core.c
Log:
-DBIG_SECURITY_HOLE now required to run apache as root.
Revision ChangesPath
1.300 +4 -1 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.299
retrieving revision 1.300
diff -C3 -r1.299 -r1.300
*** CHANGES 1997/06/28 19:55:16 1.299
--- CHANGES 1997/06/28 20:10:11 1.300
***
*** 23,32
(headers, readmes, titles), mod_negotiation (type maps), or
mod_cern_meta (meta files). [Dean Gaudet]
*) CONFIG: HostnameLookups now defaults to off because it is far better
for the net if we require people that actually need this data to
enable it. [Linus Torvalds]
!
*) mod_include was not properly changing the current directory.
[Marc Slemko] PR#742
--- 23,35
(headers, readmes, titles), mod_negotiation (type maps), or
mod_cern_meta (meta files). [Dean Gaudet]
+ *) SECURITY: Apache will refuse to run as User root unless
+ BIG_SECURITY_HOLE is defined at compile time. [Dean Gaudet]
+
*) CONFIG: HostnameLookups now defaults to off because it is far better
for the net if we require people that actually need this data to
enable it. [Linus Torvalds]
!
*) mod_include was not properly changing the current directory.
[Marc Slemko] PR#742
1.85 +15 -1 apache/src/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apache/src/http_core.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -C3 -r1.84 -r1.85
*** http_core.c 1997/06/17 00:09:13 1.84
--- http_core.c 1997/06/28 20:10:12 1.85
***
*** 889,897
else {
cmd-server-server_uid = user_id;
fprintf(stderr,
! Warning: User directive in VirtualHost requires SUEXEC
wrapper.\n);
}
}
return NULL;
}
--- 889,911
else {
cmd-server-server_uid = user_id;
fprintf(stderr,
! Warning: User directive in VirtualHost
! requires SUEXEC wrapper.\n);
}
}
+ #if !defined (BIG_SECURITY_HOLE)
+ if (cmd-server-server_uid == 0) {
+ fprintf (stderr,
+ Error:\tApache has not been designed to serve pages while running\n
+ \tas root. There are known race conditions that will allow any\n
+ \tlocal user to read any file on the system. Should you still\n
+ \tdesire to serve pages as root then add -DBIG_SECURITY_HOLE to\n
+ \tthe EXTRA_CFLAGS line in your src/Configuration file and rebuild\n
+ \tthe server. It is strongly suggested that you instead modify the\n
+ \tUser directive in your httpd.conf file to list a non-root user.\n);
+ exit (1);
+ }
+ #endif
return NULL;
}
cvs commit: apache/src CHANGES alloc.c alloc.h
dgaudet 97/06/28 13:24:29
Modified:src CHANGES alloc.c alloc.h
Log:
Add kill_only_once option for free_proc_chain to avoid the SIGKILL.
Submitted by: Stanley Gambarin [EMAIL PROTECTED]
Revision ChangesPath
1.301 +4 -0 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.300
retrieving revision 1.301
diff -C3 -r1.300 -r1.301
*** CHANGES 1997/06/28 20:10:11 1.300
--- CHANGES 1997/06/28 20:24:26 1.301
***
*** 8,13
--- 8,17
*) mod_auth deals with extra ':' delimited fields. [Marc Slemko]
+ *) Added kill_only_once option for free_proc_chain so that it won't
+ aggressively try to kill off specific children. For fastcgi.
+ [Stanley Gambarin [EMAIL PROTECTED]]
+
Changes with Apache 1.2.1
*) SECURITY: Don't serve file system objects unless they are plain files,
1.34 +2 -1 apache/src/alloc.c
Index: alloc.c
===
RCS file: /export/home/cvs/apache/src/alloc.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -C3 -r1.33 -r1.34
*** alloc.c 1997/06/23 23:56:16 1.33
--- alloc.c 1997/06/28 20:24:27 1.34
***
*** 1301,1307
#endif
for (p = procs; p; p = p-next) {
! if (p-kill_how == kill_after_timeout) {
/* Subprocess may be dead already. Only need the timeout if not. */
if (kill (p-pid, SIGTERM) != -1)
need_timeout = 1;
--- 1301,1308
#endif
for (p = procs; p; p = p-next) {
! if ((p-kill_how == kill_after_timeout)
! || (p-kill_how == kill_only_once)) {
/* Subprocess may be dead already. Only need the timeout if not. */
if (kill (p-pid, SIGTERM) != -1)
need_timeout = 1;
1.23 +2 -1 apache/src/alloc.h
Index: alloc.h
===
RCS file: /export/home/cvs/apache/src/alloc.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C3 -r1.22 -r1.23
*** alloc.h 1997/06/15 19:22:23 1.22
--- alloc.h 1997/06/28 20:24:27 1.23
***
*** 237,243
* to call in the child, and an argument to be passed to the function.
*/
! enum kill_conditions { kill_never, kill_always, kill_after_timeout,
just_wait};
int spawn_child_err (pool *, int (*)(void *), void *,
enum kill_conditions, FILE **pipe_in, FILE **pipe_out,
--- 237,244
* to call in the child, and an argument to be passed to the function.
*/
! enum kill_conditions { kill_never, kill_always, kill_after_timeout,
just_wait,
! kill_only_once };
int spawn_child_err (pool *, int (*)(void *), void *,
enum kill_conditions, FILE **pipe_in, FILE **pipe_out,
cvs commit: apache/htdocs/manual index.html new_features_1_3.html
dgaudet 97/06/28 13:31:10 Modified:htdocs/manual Tag: APACHE_1_2_X index.html Removed: htdocs/manual Tag: APACHE_1_2_X new_features_1_3.html Log: Remove 1.3isms from 1.2.1 branch. Revision ChangesPath No revision No revision 1.14.2.2 +0 -1 apache/htdocs/manual/index.html Index: index.html === RCS file: /export/home/cvs/apache/htdocs/manual/index.html,v retrieving revision 1.14.2.1 retrieving revision 1.14.2.2 diff -C3 -r1.14.2.1 -r1.14.2.2 *** index.html1997/06/27 03:01:58 1.14.2.1 --- index.html1997/06/28 20:31:09 1.14.2.2 *** *** 19,25 h3a name=newRelease Notes/a/h3 ul - lia href=new_features_1_3.htmlNew features in Apache 1.3/a lia href=new_features_1_2.htmlNew features in Apache 1.2/a lia href=new_features_1_1.htmlNew features in Apache 1.1/a lia href=new_features_1_0.htmlNew features in Apache 1.0/a --- 19,24
cvs commit: apache/htdocs/manual/misc FAQ.html fin_wait_2.html known_bugs.html
dgaudet 97/06/28 13:55:45 Modified:htdocs/manual/misc FAQ.html fin_wait_2.html known_bugs.html Log: Update bind-8.1 docs in FAQ. Update known_bugs with 1.2.1 relevance. Remove some 192.168.x.x host references in known_bugs. Add note about sunos 4.x and KeepAlive off. Revision ChangesPath 1.75 +10 -1 apache/htdocs/manual/misc/FAQ.html Index: FAQ.html === RCS file: /export/home/cvs/apache/htdocs/manual/misc/FAQ.html,v retrieving revision 1.74 retrieving revision 1.75 diff -C3 -r1.74 -r1.75 *** FAQ.html 1997/06/26 12:17:20 1.74 --- FAQ.html 1997/06/28 20:55:42 1.75 *** *** 15,21 !--#include virtual=header.html -- H1 ALIGN=CENTERApache Server Frequently Asked Questions/H1 P ! $Revision: 1.74 $ ($Date: 1997/06/26 12:17:20 $) /P P The latest version of this FAQ is always available from the main --- 15,21 !--#include virtual=header.html -- H1 ALIGN=CENTERApache Server Frequently Asked Questions/H1 P ! $Revision: 1.75 $ ($Date: 1997/06/28 20:55:42 $) /P P The latest version of this FAQ is always available from the main *** *** 1481,1486 --- 1481,1495 file, then re-running CODEConfigure/CODE, should resolve the problem. /P + pbNote:/b As of BIND 8.1.1, the bind libraries and files are + installed under code/usr/local/bind/code by default. So you + should not run into this problem. Should you want to use the bind + resolvers you'll have to add the following to the respective lines: + blockquotepre + EXTRA_CFLAGS=-I/usr/local/bind/include + EXTRA_LFLAGS=-L/usr/local/bind/lib + EXTRA_LIBS=-lbind + /pre/blockquote HR /LI LIA NAME=set-servername 1.9 +6 -0 apache/htdocs/manual/misc/fin_wait_2.html Index: fin_wait_2.html === RCS file: /export/home/cvs/apache/htdocs/manual/misc/fin_wait_2.html,v retrieving revision 1.8 retrieving revision 1.9 diff -C3 -r1.8 -r1.9 *** fin_wait_2.html 1997/06/24 18:39:34 1.8 --- fin_wait_2.html 1997/06/28 20:55:43 1.9 *** *** 266,271 --- 266,277 mbuf clusters you want to your kernel config file and rebuilding your kernel.P /DL + + H3Disable KeepAlive/H3 + PIf you are unable to do any of the above then you should, as a last + resort, disable KeepAlive. Edit your httpd.conf and change KeepAlive On + to KeepAlive Off. + H2LIFeedback/H2 If you have any information to add to this page, please contact me at 1.19 +19 -21apache/htdocs/manual/misc/known_bugs.html Index: known_bugs.html === RCS file: /export/home/cvs/apache/htdocs/manual/misc/known_bugs.html,v retrieving revision 1.18 retrieving revision 1.19 diff -C3 -r1.18 -r1.19 *** known_bugs.html 1997/06/12 14:05:31 1.18 --- known_bugs.html 1997/06/28 20:55:43 1.19 *** *** 41,50 source file codeconf.h/code for your architecture. This will be tracked as a href=http://www.apache.org/bugdb.cgi/full/467;PR#467/a. ! /LI a name=cnegbug/a ! LIApache's A HREF=../content-negotiation.htmlContent Negotiation/A should pick the smallest variant if there are several that are equally acceptable. A bug in 1.2 means it no longer does this unless all the variants have character sets. --- 41,51 source file codeconf.h/code for your architecture. This will be tracked as a href=http://www.apache.org/bugdb.cgi/full/467;PR#467/a. ! P/LI a name=cnegbug/a ! LIbFixed in 1.2.1./b ! Apache's A HREF=../content-negotiation.htmlContent Negotiation/A should pick the smallest variant if there are several that are equally acceptable. A bug in 1.2 means it no longer does this unless all the variants have character sets. *** *** 53,65 pick the last equally acceptable variant instead of the first. This will be tracked as a href=http://www.apache.org/bugdb.cgi/full/94;PR#94/a. ! /LI LI The PATH_INFO part of a request URI cannot include the sequence CODE%2f/CODE. This will be tracked as A HREF=http://www.apache.org/bugdb.cgi/full/543;PR#543/A. ! /LI LIUsers of early 1.2 betas reported problems with many connections stuck in the FIN_WAIT_2 state due to server --- 54,66 pick the last equally acceptable variant instead of the first. This will be tracked as a href=http://www.apache.org/bugdb.cgi/full/94;PR#94/a. ! P/LI
cvs commit: apache/htdocs/manual/misc FAQ.html fin_wait_2.html known_bugs.html
dgaudet 97/06/28 13:58:19 Modified:htdocs/manual/misc Tag: APACHE_1_2_X FAQ.html fin_wait_2.html known_bugs.html Log: Update with latest from HEAD. Revision ChangesPath No revision No revision 1.63.2.4 +10 -1 apache/htdocs/manual/misc/FAQ.html Index: FAQ.html === RCS file: /export/home/cvs/apache/htdocs/manual/misc/FAQ.html,v retrieving revision 1.63.2.3 retrieving revision 1.63.2.4 diff -C3 -r1.63.2.3 -r1.63.2.4 *** FAQ.html 1997/06/27 03:02:04 1.63.2.3 --- FAQ.html 1997/06/28 20:58:16 1.63.2.4 *** *** 15,21 !--#include virtual=header.html -- H1 ALIGN=CENTERApache Server Frequently Asked Questions/H1 P ! $Revision: 1.63.2.3 $ ($Date: 1997/06/27 03:02:04 $) /P P The latest version of this FAQ is always available from the main --- 15,21 !--#include virtual=header.html -- H1 ALIGN=CENTERApache Server Frequently Asked Questions/H1 P ! $Revision: 1.63.2.4 $ ($Date: 1997/06/28 20:58:16 $) /P P The latest version of this FAQ is always available from the main *** *** 1481,1486 --- 1481,1495 file, then re-running CODEConfigure/CODE, should resolve the problem. /P + pbNote:/b As of BIND 8.1.1, the bind libraries and files are + installed under code/usr/local/bind/code by default. So you + should not run into this problem. Should you want to use the bind + resolvers you'll have to add the following to the respective lines: + blockquotepre + EXTRA_CFLAGS=-I/usr/local/bind/include + EXTRA_LFLAGS=-L/usr/local/bind/lib + EXTRA_LIBS=-lbind + /pre/blockquote HR /LI LIA NAME=set-servername 1.7.2.2 +6 -0 apache/htdocs/manual/misc/fin_wait_2.html Index: fin_wait_2.html === RCS file: /export/home/cvs/apache/htdocs/manual/misc/fin_wait_2.html,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -C3 -r1.7.2.1 -r1.7.2.2 *** fin_wait_2.html 1997/06/27 03:02:05 1.7.2.1 --- fin_wait_2.html 1997/06/28 20:58:16 1.7.2.2 *** *** 266,271 --- 266,277 mbuf clusters you want to your kernel config file and rebuilding your kernel.P /DL + + H3Disable KeepAlive/H3 + PIf you are unable to do any of the above then you should, as a last + resort, disable KeepAlive. Edit your httpd.conf and change KeepAlive On + to KeepAlive Off. + H2LIFeedback/H2 If you have any information to add to this page, please contact me at 1.14.2.3 +19 -21apache/htdocs/manual/misc/known_bugs.html Index: known_bugs.html === RCS file: /export/home/cvs/apache/htdocs/manual/misc/known_bugs.html,v retrieving revision 1.14.2.2 retrieving revision 1.14.2.3 diff -C3 -r1.14.2.2 -r1.14.2.3 *** known_bugs.html 1997/06/27 03:02:06 1.14.2.2 --- known_bugs.html 1997/06/28 20:58:17 1.14.2.3 *** *** 41,50 source file codeconf.h/code for your architecture. This will be tracked as a href=http://www.apache.org/bugdb.cgi/full/467;PR#467/a. ! /LI a name=cnegbug/a ! LIApache's A HREF=../content-negotiation.htmlContent Negotiation/A should pick the smallest variant if there are several that are equally acceptable. A bug in 1.2 means it no longer does this unless all the variants have character sets. --- 41,51 source file codeconf.h/code for your architecture. This will be tracked as a href=http://www.apache.org/bugdb.cgi/full/467;PR#467/a. ! P/LI a name=cnegbug/a ! LIbFixed in 1.2.1./b ! Apache's A HREF=../content-negotiation.htmlContent Negotiation/A should pick the smallest variant if there are several that are equally acceptable. A bug in 1.2 means it no longer does this unless all the variants have character sets. *** *** 53,65 pick the last equally acceptable variant instead of the first. This will be tracked as a href=http://www.apache.org/bugdb.cgi/full/94;PR#94/a. ! /LI LI The PATH_INFO part of a request URI cannot include the sequence CODE%2f/CODE. This will be tracked as A HREF=http://www.apache.org/bugdb.cgi/full/543;PR#543/A. ! /LI LIUsers of early 1.2 betas reported problems with many connections stuck in the FIN_WAIT_2 state due to server --- 54,66 pick the last equally acceptable variant instead of the first. This will be tracked as a
cvs commit: apache/htdocs/manual/misc FAQ.html known_bugs.html
dgaudet 97/06/28 14:05:33 Modified:htdocs/manual/misc FAQ.html known_bugs.html Log: Provide links to descriptors.html. Revision ChangesPath 1.76 +5 -1 apache/htdocs/manual/misc/FAQ.html Index: FAQ.html === RCS file: /export/home/cvs/apache/htdocs/manual/misc/FAQ.html,v retrieving revision 1.75 retrieving revision 1.76 diff -C3 -r1.75 -r1.76 *** FAQ.html 1997/06/28 20:55:42 1.75 --- FAQ.html 1997/06/28 21:05:31 1.76 *** *** 15,21 !--#include virtual=header.html -- H1 ALIGN=CENTERApache Server Frequently Asked Questions/H1 P ! $Revision: 1.75 $ ($Date: 1997/06/28 20:55:42 $) /P P The latest version of this FAQ is always available from the main --- 15,21 !--#include virtual=header.html -- H1 ALIGN=CENTERApache Server Frequently Asked Questions/H1 P ! $Revision: 1.76 $ ($Date: 1997/06/28 21:05:31 $) /P P The latest version of this FAQ is always available from the main *** *** 863,868 --- 863,872 P Since this is an operating-system limitation, there's not much else available in the way of solutions. + P + As of 1.2.1 we have made attempts to work around various limitations + involving running with many descriptors. + a href=descriptors.htmlMore information is available./a /P HR 1.20 +2 -2 apache/htdocs/manual/misc/known_bugs.html Index: known_bugs.html === RCS file: /export/home/cvs/apache/htdocs/manual/misc/known_bugs.html,v retrieving revision 1.19 retrieving revision 1.20 diff -C3 -r1.19 -r1.20 *** known_bugs.html 1997/06/28 20:55:43 1.19 --- known_bugs.html 1997/06/28 21:05:32 1.20 *** *** 99,105 See A HREF=http://www.apache.org/bugdb.cgi/full/681;PR#681/A. P/LI ! LIbWorkaround available in 1.2.1./b There appears to be a problem on BSDI 2.1 with large numbers of virtual hosts. This appears similar to a file-descriptor limit but BSDI should not have this problem. This will be tracked as --- 99,105 See A HREF=http://www.apache.org/bugdb.cgi/full/681;PR#681/A. P/LI ! LIa href=descriptors.htmlbWorkaround available in 1.2.1./b/a There appears to be a problem on BSDI 2.1 with large numbers of virtual hosts. This appears similar to a file-descriptor limit but BSDI should not have this problem. This will be tracked as *** *** 107,113 See also the A HREF=FAQ.html#fdlimApache FAQ/A. P/LI ! LIbWorkaround available in 1.2.1./b Solaris 2 has problems with large numbers of virtual hosts. This is because of an operating system limit of 256 file pointers, not due to Apache. See also the A HREF=FAQ.html#fdlimApache FAQ/A. --- 107,113 See also the A HREF=FAQ.html#fdlimApache FAQ/A. P/LI ! LIa href=descriptors.htmlbWorkaround available in 1.2.1./b/a Solaris 2 has problems with large numbers of virtual hosts. This is because of an operating system limit of 256 file pointers, not due to Apache. See also the A HREF=FAQ.html#fdlimApache FAQ/A.
cvs commit: apache/src CHANGES mod_expires.c
dgaudet 97/06/28 14:45:10
Modified:src CHANGES mod_expires.c
Log:
Issue cache-control: max-age headers, and optimize the handler.
Submitted by: Rob Hartill
Reviewed by: Dean Gaudet
Revision ChangesPath
1.302 +11 -7 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.301
retrieving revision 1.302
diff -C3 -r1.301 -r1.302
*** CHANGES 1997/06/28 20:24:26 1.301
--- CHANGES 1997/06/28 21:45:09 1.302
***
*** 1,16
Changes with Apache 1.3
*) Added IconHeight and IconWidth to mod_dir's IndexOptions directive.
When used together, these cause mod_dir to emit HEIGHT and WIDTH
attributes in the FancyIndexing IMG tags. [Ken Coar]
! *) Added NT support [Ben Laurie and Ambarish Malpani [EMAIL PROTECTED]]
!
! *) mod_auth deals with extra ':' delimited fields. [Marc Slemko]
!
! *) Added kill_only_once option for free_proc_chain so that it won't
! aggressively try to kill off specific children. For fastcgi.
! [Stanley Gambarin [EMAIL PROTECTED]]
Changes with Apache 1.2.1
--- 1,20
Changes with Apache 1.3
+
+ *) mod_expire also issues Cache-Control: max-age headers.
+ [Rob Hartill]
+
+ *) Added kill_only_once option for free_proc_chain so that it won't
+ aggressively try to kill off specific children. For fastcgi.
+ [Stanley Gambarin [EMAIL PROTECTED]]
+
+ *) mod_auth deals with extra ':' delimited fields. [Marc Slemko]
*) Added IconHeight and IconWidth to mod_dir's IndexOptions directive.
When used together, these cause mod_dir to emit HEIGHT and WIDTH
attributes in the FancyIndexing IMG tags. [Ken Coar]
! *) PORT: Added NT support
! [Ben Laurie and Ambarish Malpani [EMAIL PROTECTED]]
Changes with Apache 1.2.1
1.9 +12 -5 apache/src/mod_expires.c
Index: mod_expires.c
===
RCS file: /export/home/cvs/apache/src/mod_expires.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C3 -r1.8 -r1.9
*** mod_expires.c 1997/06/17 00:09:14 1.8
--- mod_expires.c 1997/06/28 21:45:09 1.9
***
*** 384,401
int add_expires(request_rec *r)
{
! expires_dir_config *conf =
! (expires_dir_config *)get_module_config(r-per_dir_config,
expires_module);
char *code;
time_t base;
time_t additional;
time_t expires;
! if ( r-finfo.st_mode == 0 )
return DECLINED;
! /* COMMA bites my ass...
! */
if ( conf == NULL ) {
log_reason (internal error in expires_module; add_expires(), conf
== NULL, r-filename, r);
return SERVER_ERROR;
--- 384,406
int add_expires(request_rec *r)
{
! expires_dir_config *conf;
char *code;
time_t base;
time_t additional;
time_t expires;
+ char age[20];
! if (is_HTTP_ERROR(r-status)) /* Don't add Expires headers to errors */
return DECLINED;
! if (r-main != NULL) /* Say no to subrequests */
! return DECLINED;
!
! if ( r-finfo.st_mode == 0 ) /* no file ? shame. */
! return DECLINED;
!
! conf = (expires_dir_config *)get_module_config(r-per_dir_config,
expires_module);
if ( conf == NULL ) {
log_reason (internal error in expires_module; add_expires(), conf
== NULL, r-filename, r);
return SERVER_ERROR;
***
*** 451,456
--- 456,463
};
expires = base + additional;
+ ap_snprintf(age, sizeof(age), max-age=%d, (int)expires -
(int)time(NULL));
+ table_set( r-headers_out, Cache-Control, age);
tzset();/* redundant? called implicitly by localtime, at least
* under FreeBSD
*/
cvs commit: apache/src CHANGES http_core.c
dgaudet 97/06/28 15:00:18
Modified:src Tag: APACHE_1_2_X CHANGES http_core.c
Log:
Whack people upside the head if they try to run apache as root.
Revision ChangesPath
No revision
No revision
1.286.2.15 +4 -1 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.286.2.14
retrieving revision 1.286.2.15
diff -C3 -r1.286.2.14 -r1.286.2.15
*** CHANGES 1997/06/28 19:51:25 1.286.2.14
--- CHANGES 1997/06/28 22:00:15 1.286.2.15
***
*** 13,22
(headers, readmes, titles), mod_negotiation (type maps), or
mod_cern_meta (meta files). [Dean Gaudet]
*) CONFIG: HostnameLookups now defaults to off because it is far better
for the net if we require people that actually need this data to
enable it. [Linus Torvalds]
!
*) mod_include was not properly changing the current directory.
[Marc Slemko] PR#742
--- 13,25
(headers, readmes, titles), mod_negotiation (type maps), or
mod_cern_meta (meta files). [Dean Gaudet]
+ *) SECURITY: Apache will refuse to run as User root unless
+ BIG_SECURITY_HOLE is defined at compile time. [Dean Gaudet]
+
*) CONFIG: HostnameLookups now defaults to off because it is far better
for the net if we require people that actually need this data to
enable it. [Linus Torvalds]
!
*) mod_include was not properly changing the current directory.
[Marc Slemko] PR#742
1.81.2.1 +15 -1 apache/src/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apache/src/http_core.c,v
retrieving revision 1.81
retrieving revision 1.81.2.1
diff -C3 -r1.81 -r1.81.2.1
*** http_core.c 1997/05/08 13:09:24 1.81
--- http_core.c 1997/06/28 22:00:16 1.81.2.1
***
*** 886,894
else {
cmd-server-server_uid = user_id;
fprintf(stderr,
! Warning: User directive in VirtualHost requires SUEXEC
wrapper.\n);
}
}
return NULL;
}
--- 886,908
else {
cmd-server-server_uid = user_id;
fprintf(stderr,
! Warning: User directive in VirtualHost
! requires SUEXEC wrapper.\n);
}
}
+ #if !defined (BIG_SECURITY_HOLE)
+ if (cmd-server-server_uid == 0) {
+ fprintf (stderr,
+ Error:\tApache has not been designed to serve pages while running\n
+ \tas root. There are known race conditions that will allow any\n
+ \tlocal user to read any file on the system. Should you still\n
+ \tdesire to serve pages as root then add -DBIG_SECURITY_HOLE to\n
+ \tthe EXTRA_CFLAGS line in your src/Configuration file and rebuild\n
+ \tthe server. It is strongly suggested that you instead modify the\n
+ \tUser directive in your httpd.conf file to list a non-root user.\n);
+ exit (1);
+ }
+ #endif
return NULL;
}
cvs commit: apache/src CHANGES mod_include.c
dgaudet 97/06/28 15:01:44
Modified:src Tag: APACHE_1_2_X CHANGES mod_include.c
Log:
PR#644: mod_include trampled on r-args when it shouldn't
Revision ChangesPath
No revision
No revision
1.286.2.16 +3 -0 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.286.2.15
retrieving revision 1.286.2.16
diff -C3 -r1.286.2.15 -r1.286.2.16
*** CHANGES 1997/06/28 22:00:15 1.286.2.15
--- CHANGES 1997/06/28 22:01:41 1.286.2.16
***
*** 20,25
--- 20,28
for the net if we require people that actually need this data to
enable it. [Linus Torvalds]
+ *) QUERY_STRING was unescaped in mod_include, it shouldn't be.
+ [Dean Gaudet] PR#644
+
*) mod_include was not properly changing the current directory.
[Marc Slemko] PR#742
1.33.2.3 +12 -6 apache/src/mod_include.c
Index: mod_include.c
===
RCS file: /export/home/cvs/apache/src/mod_include.c,v
retrieving revision 1.33.2.2
retrieving revision 1.33.2.3
diff -C3 -r1.33.2.2 -r1.33.2.3
*** mod_include.c 1997/06/28 19:50:15 1.33.2.2
--- mod_include.c 1997/06/28 22:01:42 1.33.2.3
***
*** 128,136
else
table_set (e, DOCUMENT_NAME, r-uri);
if (r-args) {
! unescape_url (r-args);
table_set (e, QUERY_STRING_UNESCAPED,
!escape_shell_cmd (r-pool, r-args));
}
}
--- 128,138
else
table_set (e, DOCUMENT_NAME, r-uri);
if (r-args) {
! char *arg_copy = pstrdup (r-pool, r-args);
!
! unescape_url (arg_copy);
table_set (e, QUERY_STRING_UNESCAPED,
!escape_shell_cmd (r-pool, arg_copy));
}
}
***
*** 625,634
}
if (r-args) {
table_set (env, QUERY_STRING, r-args);
! unescape_url (r-args);
table_set (env, QUERY_STRING_UNESCAPED,
!escape_shell_cmd (r-pool, r-args));
}
error_log2stderr (r-server);
--- 627,638
}
if (r-args) {
+ char *arg_copy = pstrdup (r-pool, r-args);
+
table_set (env, QUERY_STRING, r-args);
! unescape_url (arg_copy);
table_set (env, QUERY_STRING_UNESCAPED,
!escape_shell_cmd (r-pool, arg_copy));
}
error_log2stderr (r-server);
***
*** 1666,1675
chdir_file (r-filename);
if (r-args) { /* add QUERY stuff to env cause it ain't yet */
table_set (r-subprocess_env, QUERY_STRING, r-args);
! unescape_url (r-args);
table_set (r-subprocess_env, QUERY_STRING_UNESCAPED,
! escape_shell_cmd (r-pool, r-args));
}
while(1) {
--- 1670,1681
chdir_file (r-filename);
if (r-args) { /* add QUERY stuff to env cause it ain't yet */
+ char *arg_copy = pstrdup (r-pool, r-args);
+
table_set (r-subprocess_env, QUERY_STRING, r-args);
! unescape_url (arg_copy);
table_set (r-subprocess_env, QUERY_STRING_UNESCAPED,
! escape_shell_cmd (r-pool, arg_copy));
}
while(1) {
cvs commit: apache/src http_config.c http_config.h http_main.c
dgaudet 97/06/28 15:12:56
Modified:src http_config.c http_config.h http_main.c
Log:
The 1.2.1 slack changes included a reordering of the opening of logs and
sockets. Merge this reordering back up into 1.3.
Revision ChangesPath
1.51 +8 -3 apache/src/http_config.c
Index: http_config.c
===
RCS file: /export/home/cvs/apache/src/http_config.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -C3 -r1.50 -r1.51
*** http_config.c 1997/06/21 22:27:10 1.50
--- http_config.c 1997/06/28 22:12:53 1.51
***
*** 1097,1103
server_rec *read_config(pool *p, pool *ptemp, char *confname)
{
server_rec *s = init_server_config(p);
- module *m;
init_config_globals(p);
--- 1097,1102
***
*** 1109,1120
fixup_virtual_hosts (p, s);
default_listeners (p, s);
for (m = top_module; m; m = m-next)
if (m-init)
(*m-init) (s, p);
-
- return s;
}
/
--- 1108,1125
fixup_virtual_hosts (p, s);
default_listeners (p, s);
+
+ return s;
+ }
+
+ void init_modules(pool *p, server_rec *s)
+ {
+ module *m;
+
for (m = top_module; m; m = m-next)
if (m-init)
(*m-init) (s, p);
}
/
1.32 +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.31
retrieving revision 1.32
diff -C3 -r1.31 -r1.32
*** http_config.h 1997/06/28 21:49:23 1.31
--- http_config.h 1997/06/28 22:12:54 1.32
***
*** 261,266
--- 261,267
/* For http_main.c... */
server_rec *read_config (pool *conf_pool, pool *temp_pool, char
*config_name);
+ void init_modules(pool *p, server_rec *s);
void setup_prelinked_modules();
void show_directives();
void show_modules();
1.162 +18 -14apache/src/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache/src/http_main.c,v
retrieving revision 1.161
retrieving revision 1.162
diff -C3 -r1.161 -r1.162
*** http_main.c 1997/06/27 08:13:14 1.161
--- http_main.c 1997/06/28 22:12:54 1.162
***
*** 2361,2380
ptrans = make_sub_pool (pconf);
server_conf = read_config (pconf, ptrans, server_confname);
- open_logs (server_conf, pconf);
- set_group_privs ();
- accept_mutex_init (pconf);
- if (!is_graceful) {
- reinit_scoreboard(pconf);
- }
- #ifdef SCOREBOARD_FILE
- else {
- scoreboard_fname = server_root_relative (pconf, scoreboard_fname);
- note_cleanups_for_fd (pconf, scoreboard_fd);
- }
- #endif
-
- default_server_hostnames (server_conf);
listenmaxfd = -1;
FD_ZERO (listenfds);
--- 2361,2366
***
*** 2391,2396
--- 2377,2398
}
close_unused_listeners ();
+ init_modules (pconf, server_conf);
+ open_logs (server_conf, pconf);
+ set_group_privs ();
+ accept_mutex_init (pconf);
+ if (!is_graceful) {
+ reinit_scoreboard(pconf);
+ }
+ #ifdef SCOREBOARD_FILE
+ else {
+ scoreboard_fname = server_root_relative (pconf, scoreboard_fname);
+ note_cleanups_for_fd (pconf, scoreboard_fd);
+ }
+ #endif
+
+ default_server_hostnames (server_conf);
+
set_signals ();
log_pid (pconf, pid_fname);
***
*** 2598,2603
--- 2600,2606
suexec_enabled = init_suexec();
server_conf = read_config (pconf, ptrans, server_confname);
+ init_modules (pconf, server_conf);
if(standalone) {
clear_pool (pconf); /* standalone_main rereads... */
***
*** 3482,3487
--- 3485,3491
setup_prelinked_modules();
server_conf = read_config (pconf, ptrans, server_confname);
+ init_modules (pconf, server_conf);
suexec_enabled = init_suexec();
open_logs(server_conf, pconf);
set_group_privs();
cvs commit: apache/src conf.h
dgaudet 97/06/28 15:20:08 Modified:src Tag: APACHE_1_2_X conf.h Log: Missed Jim's NO_SLACK for A/UX. Revision ChangesPath No revision No revision 1.99.2.2 +1 -0 apache/src/conf.h Index: conf.h === RCS file: /export/home/cvs/apache/src/conf.h,v retrieving revision 1.99.2.1 retrieving revision 1.99.2.2 diff -C3 -r1.99.2.1 -r1.99.2.2 *** conf.h1997/06/27 01:47:45 1.99.2.1 --- conf.h1997/06/28 22:20:06 1.99.2.2 *** *** 328,333 --- 328,334 * even on heavy systems sbrk() would be called at all... */ #define NO_LINGCLOSE + #define NO_SLACK #elif defined(SVR4) #define NO_KILLPG
cvs commit: apache/src conf.h
dgaudet 97/06/28 16:07:26 Modified:src conf.h Log: As discussed, enable flock serialized accept under freebsd, and a/ux. And I also enabled it under sunos4, I'm about to go double check that's correct for sunos4. Revision ChangesPath 1.105 +3 -0 apache/src/conf.h Index: conf.h === RCS file: /export/home/cvs/apache/src/conf.h,v retrieving revision 1.104 retrieving revision 1.105 diff -C3 -r1.104 -r1.105 *** conf.h1997/06/28 22:39:20 1.104 --- conf.h1997/06/28 23:07:25 1.105 *** *** 89,94 --- 89,95 typedef int rlim_t; #define memmove(a,b,c) bcopy(b,a,c) #define NO_LINGCLOSE + #define USE_FLOCK_SERIALIZED_ACCEPT #elif defined(SOLARIS2) #undef HAVE_GMTOFF *** *** 329,334 --- 330,336 */ #define NO_LINGCLOSE #define NO_SLACK + #define USE_FLOCK_SERIALIZED_ACCEPT #elif defined(SVR4) #define NO_KILLPG *** *** 411,416 --- 413,419 (defined(__FreeBSD_version) (__FreeBSD_version 22)) typedef quad_t rlim_t; #endif + #define USE_FLOCK_SERIALIZED_ACCEPT #elif defined(QNX) #ifndef crypt
cvs commit: apache/src/modules/proxy mod_proxy.c
marc97/06/28 16:39:55
Modified:src/modules/proxy mod_proxy.c
Log:
Fix return type of initializer.
Revision ChangesPath
1.14 +2 -4 apache/src/modules/proxy/mod_proxy.c
Index: mod_proxy.c
===
RCS file: /export/home/cvs/apache/src/modules/proxy/mod_proxy.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C3 -r1.13 -r1.14
*** mod_proxy.c 1997/06/15 19:22:47 1.13
--- mod_proxy.c 1997/06/28 23:39:54 1.14
***
*** 179,190
else return OK; /* otherwise; we've done the best we can */
}
! static int
proxy_init(server_rec *r, pool *p)
{
proxy_garbage_init(r, p);
-
- return(0);
}
--- 179,188
else return OK; /* otherwise; we've done the best we can */
}
! void
proxy_init(server_rec *r, pool *p)
{
proxy_garbage_init(r, p);
}
***
*** 544,550
module proxy_module = {
STANDARD_MODULE_STUFF,
!proxy_init,/* initializer */
NULL,/* create per-directory config structure */
NULL,/* merge per-directory config structures */
create_proxy_config, /* create per-server config structure */
--- 542,548
module proxy_module = {
STANDARD_MODULE_STUFF,
!proxy_init, /* initializer */
NULL,/* create per-directory config structure */
NULL,/* merge per-directory config structures */
create_proxy_config, /* create per-server config structure */
cvs commit: apache/src http_conf_globals.h http_config.c http_core.c http_main.c httpd.h
marc97/06/28 16:57:59
Modified:htdocs/manual/mod core.html directives.html
src http_conf_globals.h http_config.c http_core.c
http_main.c httpd.h
Log:
Add ListenBacklog directive to control the backlog passed to listen().
Also change the default to 511 for platforms that use an 8-bit datatype
to store it.
A slightly different implementation than suggested by Taso Devetzis
[EMAIL PROTECTED], who submitted the PR.
PR: 240
Reviewed by: Dean Gaudet, Jim Jagielski
Revision ChangesPath
1.59 +14 -0 apache/htdocs/manual/mod/core.html
Index: core.html
===
RCS file: /export/home/cvs/apache/htdocs/manual/mod/core.html,v
retrieving revision 1.58
retrieving revision 1.59
diff -C3 -r1.58 -r1.59
*** core.html 1997/06/22 23:58:38 1.58
--- core.html 1997/06/28 23:57:53 1.59
***
*** 43,48
--- 43,49
liA HREF=#keepalivetimeoutKeepAliveTimeout/A
liA HREF=#limitlt;Limitgt;/A
liA HREF=#listenListen/A
+ liA HREF=#listenbacklogListenBacklog/A
liA HREF=#locationlt;Locationgt;/A
liA HREF=#maxclientsMaxClients/A
liA HREF=#maxkeepaliverequestsMaxKeepAliveRequests/a
***
*** 657,662
--- 658,676
strongSee Also:/strong
a href=../misc/known_bugs.html#listenbugKnown Bugs/a/p
hr
+
+ A NAME=listenbacklogH2ListenBacklog/H2/A
+ strongSyntax:/strong ListenBacklog embacklog/embr
+ strongDefault:/strong codeListenBacklog 511/codebr
+ strongContext:/strong server configbr
+ strongStatus:/strong Corebr
+ strongCompatibility:/strong ListenBacklog is only available in Apache
+ versions after 1.2.0.p
+
+ The maximum length of the queue of pending connections. Generally no
+ tuning is needed or desired, however on some systems it is desirable
+ to increase this when under a TCP SYN flood attack. See
+ the backlog parameter to the codelisten(2)/code system call.
A name=limith2lt;Limitgt; directive/h2/A
!--%plaintext lt;?INDEX {\tt Limit} section directivegt; --
1.21 +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.20
retrieving revision 1.21
diff -C3 -r1.20 -r1.21
*** directives.html 1997/06/04 16:14:14 1.20
--- directives.html 1997/06/28 23:57:54 1.21
***
*** 103,108
--- 103,109
liA HREF=mod_negotiation.html#languagepriorityLanguagePriority/A
liA HREF=core.html#limitlt;Limitgt;/A
liA HREF=core.html#listenListen/A
+ liA HREF=core.html#listenbacklogListenBacklog/A
liA HREF=mod_dld.html#loadfileLoadFile/A
liA HREF=mod_dld.html#loadmoduleLoadModule/A
liA HREF=core.html#locationlt;Locationgt;/A
1.12 +1 -0 apache/src/http_conf_globals.h
Index: http_conf_globals.h
===
RCS file: /export/home/cvs/apache/src/http_conf_globals.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C3 -r1.11 -r1.12
*** http_conf_globals.h 1997/06/28 23:05:13 1.11
--- http_conf_globals.h 1997/06/28 23:57:55 1.12
***
*** 71,76
--- 71,77
extern int daemons_max_free;
extern int daemons_limit;
extern int suexec_enabled;
+ extern int listenbacklog;
extern char *pid_fname;
extern char *scoreboard_fname;
1.53 +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.52
retrieving revision 1.53
diff -C3 -r1.52 -r1.53
*** http_config.c 1997/06/28 23:05:13 1.52
--- http_config.c 1997/06/28 23:57:55 1.53
***
*** 1044,1049
--- 1044,1050
max_requests_per_child = DEFAULT_MAX_REQUESTS_PER_CHILD;
bind_address.s_addr = htonl(INADDR_ANY);
listeners = NULL;
+ listenbacklog = DEFAULT_LISTENBACKLOG;
}
server_rec *init_server_config(pool *p)
1.87 +12 -0 apache/src/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apache/src/http_core.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -C3 -r1.86 -r1.87
*** http_core.c 1997/06/28 23:05:13 1.86
--- http_core.c 1997/06/28 23:57:55 1.87
***
*** 1175,1180
--- 1175,1191
return NULL;
}
+ const char *set_listenbacklog (cmd_parms *cmd, void *dummy, char *arg) {
+ int b;
+
+ if (cmd-server-is_virtual)
+
cvs commit: apache/src http_log.c
marc97/06/28 17:05:13
Modified:src http_log.c
Log:
We have ap_snprintf; use it.
Revision ChangesPath
1.16 +6 -4 apache/src/http_log.c
Index: http_log.c
===
RCS file: /export/home/cvs/apache/src/http_log.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C3 -r1.15 -r1.16
*** http_log.c1997/06/28 22:39:21 1.15
--- http_log.c1997/06/29 00:05:12 1.16
***
*** 196,202
fflush(s-error_log);
}
! void log_reason(const char *reason, const char *file, request_rec *r) {
fprintf (r-server-error_log,
[%s] access to %s failed for %s, reason: %s\n,
get_time(), file,
--- 196,203
fflush(s-error_log);
}
! void log_reason(const char *reason, const char *file, request_rec *r)
! {
fprintf (r-server-error_log,
[%s] access to %s failed for %s, reason: %s\n,
get_time(), file,
***
*** 206,214
}
void log_assert(const char *szExp,const char *szFile,int nLine)
! {
char buf[1000];
! sprintf(buf,line %d, assertion \%s\ failed,nLine,szExp);
log_unixerr(assert,szFile,buf,NULL);
! }
--- 207,216
}
void log_assert(const char *szExp,const char *szFile,int nLine)
! {
char buf[1000];
! ap_snprintf(buf, sizeof(buf),
! line %d, assertion \%s\ failed,nLine,szExp);
log_unixerr(assert,szFile,buf,NULL);
! }
cvs commit: apache/htdocs/manual/mod core.html directives.html
marc97/06/28 18:14:17
Modified:htdocs/manual/mod core.html directives.html
Log:
Add docs for LockFile and fix a few typos.
Revision ChangesPath
1.60 +21 -4 apache/htdocs/manual/mod/core.html
Index: core.html
===
RCS file: /export/home/cvs/apache/htdocs/manual/mod/core.html,v
retrieving revision 1.59
retrieving revision 1.60
diff -C3 -r1.59 -r1.60
*** core.html 1997/06/28 23:57:53 1.59
--- core.html 1997/06/29 01:14:15 1.60
***
*** 45,50
--- 45,51
liA HREF=#listenListen/A
liA HREF=#listenbacklogListenBacklog/A
liA HREF=#locationlt;Locationgt;/A
+ liA HREF=#lockfileLockFile/A
liA HREF=#maxclientsMaxClients/A
liA HREF=#maxkeepaliverequestsMaxKeepAliveRequests/a
liA HREF=#maxrequestsperchildMaxRequestsPerChild/A
***
*** 659,665
a href=../misc/known_bugs.html#listenbugKnown Bugs/a/p
hr
! A NAME=listenbacklogH2ListenBacklog/H2/A
strongSyntax:/strong ListenBacklog embacklog/embr
strongDefault:/strong codeListenBacklog 511/codebr
strongContext:/strong server configbr
--- 660,666
a href=../misc/known_bugs.html#listenbugKnown Bugs/a/p
hr
! A NAME=listenbacklogH2ListenBacklog/H2/A
strongSyntax:/strong ListenBacklog embacklog/embr
strongDefault:/strong codeListenBacklog 511/codebr
strongContext:/strong server configbr
***
*** 728,734
lt;Location ~ quot;/(extra|special)/dataquot;gt;
/pre
! would match URLs that contained the substring /extra/data or
/special/data./p
pThe codeLocation/code functionality is especially useful when
--- 729,735
lt;Location ~ quot;/(extra|special)/dataquot;gt;
/pre
! pwould match URLs that contained the substring /extra/data or
/special/data./p
pThe codeLocation/code functionality is especially useful when
***
*** 746,752
/pre
hr
! A name=maxclientsh2MaxClients directive/h2/A
!--%plaintext lt;?INDEX {\tt MaxClients} directivegt; --
strongSyntax:/strong MaxClients emnumber/embr
strongDefault:/strong codeMaxClients 256/codebr
--- 747,769
/pre
hr
! A NAME=lockfileH2LockFile/H2/A
! strongSyntax:/strong LockFile emfilename/emBR
! strongDefault:/strong codeLockFile logs/accept.lock/codeBR
! strongContext:/strong server configBR
! strongStatus:/strong coreP
!
! The LockFile directive sets the path to the lockfile used when
! Apache is compiled with either USE_FCNTL_SERIALIZED_ACCEPT or
! USE_FLOCK_SERIALIZED_ACCEPT. This directive should normally be
! left at its default value. The main reason for changing it is if
! the codelogs/code directory is NFS mounted, since the lockfile
! should be stored on a local disk if possible. The PID of the main
! server process is automatically appended to the filename.
!
! PHR
!
! A name=maxclientsh2MaxClients/h2/A
!--%plaintext lt;?INDEX {\tt MaxClients} directivegt; --
strongSyntax:/strong MaxClients emnumber/embr
strongDefault:/strong codeMaxClients 256/codebr
***
*** 1048,1054
See also A HREF=#accessconfigAccessConfig/A.phr
! A name=rlimit
A name=rlimitcpuh2RLimitCPU directive/h2/A
!--%plaintext lt;?INDEX {\tt RLimitCPU} directivegt; --
strongSyntax:/strong RLimitCPU em# or 'max'/em em[# or
'max']/embr
--- 1065,1071
See also A HREF=#accessconfigAccessConfig/A.phr
! A name=rlimit /A
A name=rlimitcpuh2RLimitCPU directive/h2/A
!--%plaintext lt;?INDEX {\tt RLimitCPU} directivegt; --
strongSyntax:/strong RLimitCPU em# or 'max'/em em[# or
'max']/embr
1.22 +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.21
retrieving revision 1.22
diff -C3 -r1.21 -r1.22
*** directives.html 1997/06/28 23:57:54 1.21
--- directives.html 1997/06/29 01:14:16 1.22
***
*** 107,112
--- 107,113
liA HREF=mod_dld.html#loadfileLoadFile/A
liA HREF=mod_dld.html#loadmoduleLoadModule/A
liA HREF=core.html#locationlt;Locationgt;/A
+ liA HREF=core.html#lockfileLockFile/A
liA HREF=mod_log_config.html#logformatLogFormat/A
liA HREF=core.html#maxclientsMaxClients/A
liA HREF=core.html#maxkeepaliverequestsMaxKeepAliveRequests/A
cvs commit: apache/src conf.h
jim 97/06/28 18:58:32 Modified:src conf.h Log: Minor A/UX reordering Revision ChangesPath 1.106 +3 -4 apache/src/conf.h Index: conf.h === RCS file: /export/home/cvs/apache/src/conf.h,v retrieving revision 1.105 retrieving revision 1.106 diff -C3 -r1.105 -r1.106 *** conf.h1997/06/28 23:07:25 1.105 --- conf.h1997/06/29 01:58:32 1.106 *** *** 318,336 #define NEED_STRDUP #define JMP_BUF sigjmp_buf /* fcntl() locking is expensive with NFS */ ! #undef USE_FLOCK_SERIALIZED_ACCEPT #define HAVE_SHMGET - #define MOVEBREAK 0x400 /* * NOTE: If when you run Apache under A/UX and you get a warning ! * that httpd couldn't move break, then the above value for * MOVEBREAK (64megs) is too large for your setup. Try reducing * to 0x200 which is still PLENTY of space. I doubt if * even on heavy systems sbrk() would be called at all... */ #define NO_LINGCLOSE #define NO_SLACK - #define USE_FLOCK_SERIALIZED_ACCEPT #elif defined(SVR4) #define NO_KILLPG --- 318,335 #define NEED_STRDUP #define JMP_BUF sigjmp_buf /* fcntl() locking is expensive with NFS */ ! #define USE_FLOCK_SERIALIZED_ACCEPT #define HAVE_SHMGET /* * NOTE: If when you run Apache under A/UX and you get a warning ! * that httpd couldn't move break, then the below value for * MOVEBREAK (64megs) is too large for your setup. Try reducing * to 0x200 which is still PLENTY of space. I doubt if * even on heavy systems sbrk() would be called at all... */ + #define MOVEBREAK 0x400 #define NO_LINGCLOSE #define NO_SLACK #elif defined(SVR4) #define NO_KILLPG
