Re: How to pass a multiline parameter to jenkins cli build
I have identified a solution that works :) When exporting the env variable, hit the enter key on the command line and keep adding lines and then close the quotes on the least line. This would look like the following: *prompt:> export mycs='element /reuse /main/LATEST* *> element /reuse/ip /main/LATEST* *> element /reuse/ip/file.txt /main/LATEST'* Then, test it out using echo with double quotes around the variable as: *echo "$mycs"* Once formatted as wanted, simply pass in the variable to the Jenkins CLI to be used on the other side like this: *java -jar ~/files/jenkins-cli.jar -s http:// build -s 'Fundamental/math-flex' -p DESCRIPTION="$mydesc" -p configspec_elements="$mycs"* Hope this helps\you as much as it helped me :) Denis On Friday, December 11, 2015 at 5:15:07 PM UTC-5, DGaudet wrote: > > Hey folks, > > I'm trying to pass a multiline parameter to a build from a BASH command > line. My command looks like this: > > /java -jar ~/files/jenkins-cli.jar -s http:// build -s > 'Fundamental/math-flex' -p DESCRIPTION="$mydesc" -p > configspec_elements="$mycs"/ > > I have exported both variables as: > > /export mydesc='Dry run' > export mycs='element /reuse /main/LATEST\nelement /reuse/ip /main/LATEST'/ > > When this gets into the jenkins job, the $mycs looks like this: > > /element /reuse /main/LATEST\nelement /reuse/ip /main/LATEST/ > > I was hoping/expecting the "\n" to have been expanded, but, it wasn't ;( > > How else can I get multiple lines trough the CLI interface? > > Thanks in advance for your help! > > Denis -- You received this message because you are subscribed to the Google Groups "Jenkins Users" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-users+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-users/fa99dc58-7b6b-41d0-8378-57a2d4d2df1c%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
cvs commit: apr-util/test Makefile.in
dgaudet 01/01/06 13:46:35 Modified:.Makefile.in buildconf.sh test Makefile.in Log: add a few missing dist clean targets; and warn about aclocal.m4 being autogenerated Revision ChangesPath 1.12 +3 -2 apr-util/Makefile.in Index: Makefile.in === RCS file: /home/cvs/apr-util/Makefile.in,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Makefile.in 2001/01/04 20:07:31 1.11 +++ Makefile.in 2001/01/06 21:46:34 1.12 @@ -10,11 +10,12 @@ top_builddir = @top_builddir@ @INCLUDE_RULES@ -SUBDIRS = src . build +SUBDIRS = src . build test CLEAN_TARGETS = $(TARGET_EXPORTS) DISTCLEAN_TARGETS = config.cache config.log config.status config.sub \ - include/private/apu_config.h include/private/apu_private.h + include/private/apu_config.h include/private/apu_private.h \ + include/apu.h export_vars.sh EXTRACLEAN_TARGETS = configure libtool aclocal.m4 \ include/private/apu_config.h.in 1.6 +3 -1 apr-util/buildconf.sh Index: buildconf.sh === RCS file: /home/cvs/apr-util/buildconf.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- buildconf.sh 2000/12/31 10:32:17 1.5 +++ buildconf.sh 2001/01/06 21:46:34 1.6 @@ -8,7 +8,9 @@ ltpath=`dirname $ltpath` ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4 echo Incorporating $ltfile into aclocal.m4 ... -cat build/apu-conf.m4 $ltfile aclocal.m4 +echo dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf.sh aclocal.m4 +echo dnl edits here will be lost aclocal.m4 +cat build/apu-conf.m4 $ltfile aclocal.m4 # # Create the libtool helper files 1.6 +1 -0 apr-util/test/Makefile.in Index: Makefile.in === RCS file: /home/cvs/apr-util/test/Makefile.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile.in 2001/01/04 20:07:53 1.5 +++ Makefile.in 2001/01/06 21:46:35 1.6 @@ -1,5 +1,6 @@ TARGETS = PROGRAMS = testdbm +DISTCLEAN_TARGETS = Makefile top_builddir = @top_builddir@ @INCLUDE_RULES@
cvs commit: apache-site/contributors index.html
dgaudet 00/02/23 12:23:16 Modified:contributors index.html Log: remove excess redundancy Revision ChangesPath 1.89 +2 -2 apache-site/contributors/index.html Index: index.html === RCS file: /home/cvs/apache-site/contributors/index.html,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- index.html2000/02/18 22:57:43 1.88 +++ index.html2000/02/23 20:23:15 1.89 @@ -299,8 +299,8 @@ STRONGName:/STRONG A NAME=dgaudetDean Gaudet/ABR !-- I hate mailto:s because of spiders that collect them for spam -- -STRONGEmail:/STRONG [EMAIL PROTECTED]BR -STRONGURL:/STRONG A HREF=http://www.arctic.org/~dgaudet/;http://www.arctic.org/~dgaudet//ABR +STRONGEmail:/STRONG [EMAIL PROTECTED]BR +STRONGURL:/STRONG A HREF=http://arctic.org/~dean/;http://arctic.org/~dean//ABR STRONGOrganization:/STRONG A HREF=http://www.cp.net/;Critical Path/A BR STRONGOccupation:/STRONG Sr. Software EngineerBR
Re: mod_proxy/4236: Reverse proxy features disables caching features
[In order for any reply to be added to the PR database, you need] [to include [EMAIL PROTECTED] in the Cc line and make sure the] [subject line starts with the report component and number, with ] [or without any 'Re:' prefixes (such as general/1098: or ] [Re: general/1098:). If the subject doesn't match this ] [pattern, your message will be misfiled and ignored. The ] [apbugs address is not added to the Cc line of messages from ] [the database automatically because of the potential for mail ] [loops. If you do not include this Cc, your reply may be ig- ] [nored unless you are responding to an explicit request from a ] [developer. Reply only with text; DO NOT SEND ATTACHMENTS! ] Synopsis: Reverse proxy features disables caching features State-Changed-From-To: open-closed State-Changed-By: dgaudet State-Changed-When: Sat Feb 5 13:41:07 PST 2000 State-Changed-Why: fixed in 1.3.10. thanks
cvs commit: apache-2.0/src/modules/standard mod_autoindex.c mod_cgi.c mod_cgid.c mod_expires.c mod_include.c mod_log_config.c mod_rewrite.c mod_status.c mod_usertrack.c
dgaudet 00/01/08 21:18:34
Modified:src modules.c
src/include http_protocol.h http_request.h httpd.h
util_date.h
src/lib/apr/file_io/unix filestat.c
src/lib/apr/include apr_file_io.h apr_time.h
src/lib/apr/test ab_apr.c testtime.c
src/lib/apr/time/unix Makefile.in time.c timestr.c
src/main http_core.c http_log.c http_protocol.c
http_request.c util.c util_date.c util_script.c
src/modules/experimental Makefile.tmpl
src/modules/standard mod_autoindex.c mod_cgi.c mod_cgid.c
mod_expires.c mod_include.c mod_log_config.c
mod_rewrite.c mod_status.c mod_usertrack.c
Removed: src/lib/apr/time/unix access.c
Log:
time overhaul:
- ap_time_t is a 64-bit scalar, microseconds since epoch
- ap_exploded_time_t corresponds to struct tm with a few extras
probably broken on anything except linux.
Revision ChangesPath
1.4 +12 -3 apache-2.0/src/Attic/modules.c
Index: modules.c
===
RCS file: /home/cvs/apache-2.0/src/Attic/modules.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- modules.c 1999/12/05 19:33:27 1.3
+++ modules.c 2000/01/09 05:18:15 1.4
@@ -7,7 +7,6 @@
#include http_config.h
extern module core_module;
-extern module mpm_mpmt_pthread_module;
extern module env_module;
extern module config_log_module;
extern module mime_module;
@@ -21,10 +20,14 @@
extern module action_module;
extern module userdir_module;
extern module alias_module;
+extern module rewrite_module;
extern module access_module;
extern module auth_module;
+extern module expires_module;
+extern module usertrack_module;
extern module setenvif_module;
extern module echo_module;
+extern module mpm_mpmt_pthread_module;
/*
* Modules which implicitly form the
@@ -35,7 +38,6 @@
*/
module *ap_prelinked_modules[] = {
core_module,
- mpm_mpmt_pthread_module,
env_module,
config_log_module,
mime_module,
@@ -49,10 +51,14 @@
action_module,
userdir_module,
alias_module,
+ rewrite_module,
access_module,
auth_module,
+ expires_module,
+ usertrack_module,
setenvif_module,
echo_module,
+ mpm_mpmt_pthread_module,
NULL
};
@@ -65,7 +71,6 @@
*/
module *ap_preloaded_modules[] = {
core_module,
- mpm_mpmt_pthread_module,
env_module,
config_log_module,
mime_module,
@@ -79,10 +84,14 @@
action_module,
userdir_module,
alias_module,
+ rewrite_module,
access_module,
auth_module,
+ expires_module,
+ usertrack_module,
setenvif_module,
echo_module,
+ mpm_mpmt_pthread_module,
NULL
};
1.10 +1 -1 apache-2.0/src/include/http_protocol.h
Index: http_protocol.h
===
RCS file: /home/cvs/apache-2.0/src/include/http_protocol.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- http_protocol.h 1999/12/20 16:38:31 1.9
+++ http_protocol.h 2000/01/09 05:18:16 1.10
@@ -118,7 +118,7 @@
API_EXPORT(int) ap_set_content_length(request_rec *r, long length);
API_EXPORT(int) ap_set_keepalive(request_rec *r);
-API_EXPORT(ap_time_t *) ap_rationalize_mtime(request_rec *r, ap_time_t
*mtime);
+API_EXPORT(ap_time_t) ap_rationalize_mtime(request_rec *r, ap_time_t mtime);
API_EXPORT(char *) ap_make_etag(request_rec *r, int force_weak);
API_EXPORT(void) ap_set_etag(request_rec *r);
API_EXPORT(void) ap_set_last_modified(request_rec *r);
1.5 +1 -1 apache-2.0/src/include/http_request.h
Index: http_request.h
===
RCS file: /home/cvs/apache-2.0/src/include/http_request.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- http_request.h1999/12/20 16:38:31 1.4
+++ http_request.h2000/01/09 05:18:16 1.5
@@ -104,7 +104,7 @@
API_EXPORT(void) ap_internal_redirect_handler(const char *new_uri,
request_rec *);
API_EXPORT(int) ap_some_auth_required(request_rec *r);
API_EXPORT(int) ap_is_initial_req(request_rec *r);
-API_EXPORT(ap_time_t *) ap_update_mtime(request_rec *r, ap_time_t
*dependency_mtime);
+API_EXPORT(void) ap_update_mtime(request_rec *r, ap_time_t dependency_mtime);
#ifdef CORE_PRIVATE
/* Function called by main.c to handle first-level request */
1.18 +4 -4 apache-2.0/src/include/httpd.h
Index: httpd.h
===
RCS file: /home/cvs/apache-2.0/src/include/httpd.h,v
retrieving
cvs commit: apache-2.0/src/lib/apr/test .cvsignore
dgaudet 00/01/08 21:19:04 Modified:src/lib/apr/test .cvsignore Log: more stuff to ignore Revision ChangesPath 1.2 +12 -0 apache-2.0/src/lib/apr/test/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-2.0/src/lib/apr/test/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore1999/08/17 15:59:49 1.1 +++ .cvsignore2000/01/09 05:19:02 1.2 @@ -1 +1,13 @@ Makefile +testmmap +htdigest +ab +testcontext +testargs +testtime +testthread +client +server +testsock +testproc +testfile
cvs commit: apache-2.0/src modules.c
dgaudet 00/01/08 21:23:22 Removed: src modules.c Log: what?
cvs commit: apache-2.0/src/modules/standard mod_rewrite.c mod_rewrite.h
dgaudet 99/12/30 21:03:34
Modified:src CHANGES
src/modules/standard mod_rewrite.c mod_rewrite.h
Log:
port mod_rewrite to 2.0
Submitted by: Paul J. Reder [EMAIL PROTECTED]
Revision ChangesPath
1.20 +2 -0 apache-2.0/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-2.0/src/CHANGES,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- CHANGES 1999/12/21 11:33:21 1.19
+++ CHANGES 1999/12/31 05:03:32 1.20
@@ -1,5 +1,7 @@
Changes with Apache 2.0-dev
+ *) port mod_rewrite to 2.0. [Paul J. Reder [EMAIL PROTECTED]]
+
*) More rigorous checking of Host: headers to fix security problems
with mass name-based virtual hosting (whether using mod_rewrite
or mod_vhost_alias).
1.6 +234 -202 apache-2.0/src/modules/standard/mod_rewrite.c
Index: mod_rewrite.c
===
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_rewrite.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mod_rewrite.c 1999/10/22 16:01:27 1.5
+++ mod_rewrite.c 1999/12/31 05:03:33 1.6
@@ -89,8 +89,18 @@
*/
+#include httpd.h
+#include http_config.h
+#include http_request.h
+#include http_core.h
+#include http_log.h
+#include http_protocol.h
#include mod_rewrite.h
+#if !defined(OS2) !defined(WIN32)
+#include unixd.h
+#endif
+
#ifndef NO_WRITEV
#include sys/types.h
#include sys/uio.h
@@ -183,27 +193,26 @@
{ NULL }
};
+static void register_hooks(void)
+{
+ap_hook_post_config(init_module,NULL,NULL,HOOK_MIDDLE);
+ap_hook_child_init(init_child,NULL,NULL,HOOK_MIDDLE);
+
+ap_hook_fixups(hook_fixup,NULL,NULL,HOOK_FIRST);
+ap_hook_translate_name(hook_uri2file,NULL,NULL,HOOK_FIRST);
+ap_hook_type_checker(hook_mimetype,NULL,NULL,HOOK_MIDDLE);
+}
+
/* the main config structure */
module MODULE_VAR_EXPORT rewrite_module = {
- STANDARD_MODULE_STUFF,
- init_module, /* module initializer */
+ STANDARD20_MODULE_STUFF,
config_perdir_create,/* create per-dirconfig structures */
config_perdir_merge, /* merge per-dirconfig structures */
config_server_create,/* create per-server config structures */
config_server_merge, /* merge per-server config structures */
- command_table, /* ap_table_t of config file commands
*/
+ command_table, /* ap_table_t of config file commands */
handler_table, /* [#8] MIME-typed-dispatched handlers */
- hook_uri2file, /* [#1] URI to filename translation*/
- NULL,/* [#4] validate user id from request */
- NULL,/* [#5] check if the user is ok _here_ */
- NULL,/* [#3] check access by host address */
- hook_mimetype, /* [#6] determine MIME type*/
- hook_fixup, /* [#7] pre-run fixups */
- NULL,/* [#9] log a transaction */
- NULL,/* [#2] header parser */
- init_child, /* child_init */
- NULL,/* child_exit */
- NULL /* [#0] post read-request */
+ register_hooks /* register hooks */
};
/* the cache */
@@ -211,9 +220,10 @@
/* whether proxy module is available or not */
static int proxy_available;
+static int once_through = 0;
-static char *lockname;
-static int lockfd = -1;
+static const char *lockname;
+static ap_file_t *lockfd = NULL;
/*
** +---+
@@ -238,7 +248,7 @@
a-state = ENGINE_DISABLED;
a-options = OPTION_NONE;
a-rewritelogfile = NULL;
-a-rewritelogfp= -1;
+a-rewritelogfp= NULL;
a-rewriteloglevel = 0;
a-rewritemaps = ap_make_array(p, 2, sizeof(rewritemap_entry));
a-rewriteconds= ap_make_array(p, 2, sizeof(rewritecond_entry));
@@ -271,7 +281,7 @@
a-rewritelogfile = overrides-rewritelogfile != NULL
? overrides-rewritelogfile
: base-rewritelogfile;
-a-rewritelogfp= overrides-rewritelogfp != -1
+a-rewritelogfp= overrides-rewritelogfp != NULL
? overrides-rewritelogfp
: base-rewritelogfp;
a-rewritemaps
cvs commit: apache-2.0/src/modules/standard mod_rewrite.c mod_rewrite.h
dgaudet 99/12/30 21:05:29
Modified:src/modules/standard mod_rewrite.c mod_rewrite.h
Log:
merge 1.3 changes to rewrite forward onto 2.0
Submitted by: Paul J. Reder [EMAIL PROTECTED]
Revision ChangesPath
1.7 +89 -61apache-2.0/src/modules/standard/mod_rewrite.c
Index: mod_rewrite.c
===
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_rewrite.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mod_rewrite.c 1999/12/31 05:03:33 1.6
+++ mod_rewrite.c 1999/12/31 05:05:27 1.7
@@ -102,7 +102,9 @@
#endif
#ifndef NO_WRITEV
+#ifndef NETWARE
#include sys/types.h
+#endif
#include sys/uio.h
#endif
@@ -1145,13 +1147,19 @@
return OK;
}
else if ( (strlen(r-filename) 7
-strncasecmp(r-filename, http://;, 7) == 0)
+strncasecmp(r-filename, http://;, 7) == 0)
|| (strlen(r-filename) 8
-strncasecmp(r-filename, https://;, 8) == 0)
+strncasecmp(r-filename, https://;, 8) == 0)
|| (strlen(r-filename) 9
strncasecmp(r-filename, gopher://;, 9) == 0)
|| (strlen(r-filename) 6
-strncasecmp(r-filename, ftp://;, 6) == 0)) {
+strncasecmp(r-filename, ftp://;,6) == 0)
+|| (strlen(r-filename) 5
+strncasecmp(r-filename, ldap:, 5) == 0)
+|| (strlen(r-filename) 5
+strncasecmp(r-filename, news:;, 5) == 0)
+|| (strlen(r-filename) 7
+strncasecmp(r-filename, mailto:;, 7) == 0)) {
/* it was finally rewritten to a remote URL */
/* skip 'scheme:' */
@@ -1171,8 +1179,8 @@
/* append the QUERY_STRING part */
if (r-args != NULL) {
- r-filename = ap_pstrcat(r-pool, r-filename,
-?, r-args, NULL);
+r-filename = ap_pstrcat(r-pool, r-filename, ?,
+ ap_escape_uri(r-pool, r-args),
NULL);
}
/* determine HTTP redirect response code */
@@ -1216,7 +1224,7 @@
/* it was finally rewritten to a local path */
/* expand /~user prefix */
-#ifndef WIN32
+#if !defined(WIN32) !defined(NETWARE)
r-filename = expand_tildepaths(r, r-filename);
#endif
rewritelog(r, 2, local path result: %s, r-filename);
@@ -1389,9 +1397,7 @@
* (r-path_info was already appended by the
* rewriting engine because of the per-dir context!)
*/
-if (r-args != NULL
- r-uri == r-unparsed_uri) {
-/* see proxy_http:proxy_http_canon() */
+if (r-args != NULL) {
r-filename = ap_pstrcat(r-pool, r-filename,
?, r-args, NULL);
}
@@ -1405,13 +1411,19 @@
return OK;
}
else if ( (strlen(r-filename) 7
-strncmp(r-filename, http://;, 7) == 0)
-|| (strlen(r-filename) 8
-strncmp(r-filename, https://;, 8) == 0)
+strncasecmp(r-filename, http://;, 7) == 0)
+|| (strlen(r-filename) 8
+strncasecmp(r-filename, https://;, 8) == 0)
|| (strlen(r-filename) 9
-strncmp(r-filename, gopher://;, 9) == 0)
+strncasecmp(r-filename, gopher://;, 9) == 0)
|| (strlen(r-filename) 6
-strncmp(r-filename, ftp://;, 6) == 0)) {
+strncasecmp(r-filename, ftp://;,6) == 0)
+|| (strlen(r-filename) 5
+strncasecmp(r-filename, ldap:, 5) == 0)
+|| (strlen(r-filename) 5
+strncasecmp(r-filename, news:;, 5) == 0)
+|| (strlen(r-filename) 7
+strncasecmp(r-filename, mailto:;, 7) == 0)) {
/* it was finally rewritten to a remote URL */
/* because we are in a per-dir context
@@ -1460,8 +1472,8 @@
/* append the QUERY_STRING part */
if (r-args != NULL) {
-r-filename = ap_pstrcat(r-pool, r-filename,
- ?, r-args, NULL);
+r-filename = ap_pstrcat(r-pool, r-filename, ?,
+ ap_escape_uri(r-pool, r-args),
NULL);
}
/* determine HTTP
cvs commit: apache-2.0/src/lib/apr/time/unix timestr.c
dgaudet 99/12/30 21:09:22
Modified:src/lib/apr/include apr_time.h
src/lib/apr/time/unix timestr.c
Log:
retsize should be ap_size_t, not hardwired to 32 bits
Revision ChangesPath
1.8 +1 -1 apache-2.0/src/lib/apr/include/apr_time.h
Index: apr_time.h
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_time.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- apr_time.h1999/12/30 18:31:27 1.7
+++ apr_time.h1999/12/31 05:09:20 1.8
@@ -77,7 +77,7 @@
ap_status_t ap_implode_time(ap_time_t *);
ap_status_t ap_timestr(char **date_str, struct atime_t *t, ap_timetype_e
type, ap_context_t *p);
-ap_status_t ap_strftime(char *s, ap_int32_t *retsize, ap_size_t max, const
char *format, ap_time_t *tm);
+ap_status_t ap_strftime(char *s, ap_size_t *retsize, ap_size_t max, const
char *format, ap_time_t *tm);
/* accessor functions */
ap_status_t ap_get_curtime(ap_time_t *, ap_int64_t *);
1.4 +1 -1 apache-2.0/src/lib/apr/time/unix/timestr.c
Index: timestr.c
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/time/unix/timestr.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- timestr.c 1999/12/30 18:31:28 1.3
+++ timestr.c 1999/12/31 05:09:21 1.4
@@ -126,7 +126,7 @@
*/
}
-ap_status_t ap_strftime(char *s, ap_int32_t *retsize, ap_size_t max,
+ap_status_t ap_strftime(char *s, ap_size_t *retsize, ap_size_t max,
const char *format, struct atime_t *tm)
{
(*retsize) = strftime(s, max, format, tm-explodedtime);
cvs commit: apache-2.0 STATUS
dgaudet 99/11/29 16:52:32 Modified:.STATUS Log: more accurate reflection of reality Revision ChangesPath 1.20 +4 -2 apache-2.0/STATUS Index: STATUS === RCS file: /home/cvs/apache-2.0/STATUS,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- STATUS1999/11/30 00:10:23 1.19 +++ STATUS1999/11/30 00:52:30 1.20 @@ -1,5 +1,5 @@ Apache 2.0 STATUS: -Last modified at [$Date: 1999/11/30 00:10:23 $] +Last modified at [$Date: 1999/11/30 00:52:30 $] Release: @@ -125,7 +125,9 @@ * Work on other MPMs. Possible MPMs discussed or in progress include: - Dean Gaudet's async MPM - Status: ? + Status: dean is unlikely to begin work on this any time soon... + has lots of ideas he'll share with folks willing to begin + tackling the issues. this is apache 2.1 material. - Zach Brown's [EMAIL PROTECTED] Linux siginfo MPM Status: ?
cvs commit: apache-1.3/cgi-bin printenv
dgaudet 99/11/24 10:11:00
Modified:cgi-bin printenv
Log:
no comment on the rest of this... but this is for debugging, and i don't
want a debugging tool losing information for me for the sake of looking
good.
Revision ChangesPath
1.5 +0 -1 apache-1.3/cgi-bin/printenv
Index: printenv
===
RCS file: /home/cvs/apache-1.3/cgi-bin/printenv,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- printenv 1999/11/24 13:38:55 1.4
+++ printenv 1999/11/24 18:10:58 1.5
@@ -8,7 +8,6 @@
$val = $ENV{$var};
$val =~ s|\n|\\n|g;
$val =~ s||\\|g;
-$val = substr($val, 0, 100).'[...]' if (length($val) 100);
print ${var}=\${val}\\n;
}
cvs commit: apache-1.3/htdocs index.html.en
dgaudet 99/11/01 13:48:49 Modified:htdocs index.html.en Log: i asked a friend who does interface design to comment on the it worked page. i liked what he had to say. From: James Home [EMAIL PROTECTED] reading over the page, it appears that the primary audience for the page is the person who's installing Apache. this doesn't really make sense though; the only information it's necessary to convey to that person is that the server is working, and the simple presence of the page does that. sure, there are the links to the Apache homepage and to documentation, but those don't require much prominence; if someone is looking for them, they're easy to find. I'd say that the primary audience for the *information* on the page is the poor befuddled user who doesn't know an Apache helicopter from an Apache web server and wants to know what happened to the website they've spent weeks working on. so how is a user like that going to experience the page? - a logo that they don't recognize at the bottom of the page apparently claiming responsibility for it; - some confusing It Worked! message at the top of the page; - a somewhat threatening and vague message that, despite the fact that this page is all about this mysterious software called Apache (note that it isn't explained that Apache is web server software until the very last line of small text), Apache isn't responsible for the site, and I should contact the administrator of the site involved (of course, if I was an end user who didn't understand how web servers work, I would assume *I* was the administrator of my site, leaving only this mysterious organization to contact). - clicking on the most prominent link takes me to another page that doesn't specifically mention web servers. there's a contact link though, which takes me to the page with the email address and Sally's phone number. I did a quick mockup to demonstrate how I think this might work better: http://www.vagabondage.com/~jim/apache/worked2.html Submitted by: James Home [EMAIL PROTECTED] Revision ChangesPath 1.2 +26 -38apache-1.3/htdocs/index.html.en Index: index.html.en === RCS file: /home/cvs/apache-1.3/htdocs/index.html.en,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- index.html.en 1999/08/27 15:08:02 1.1 +++ index.html.en 1999/11/01 21:48:49 1.2 @@ -1,7 +1,7 @@ !DOCTYPE HTML PUBLIC -//W3C//DTD HTML 3.2 Final//EN HTML HEAD - TITLETest Page for Apache Installation on Web Site/TITLE + TITLETest Page for Apache Installation/TITLE /HEAD !-- Background white, links blue (unvisited), navy (visited), red (active) -- BODY @@ -11,41 +11,29 @@ VLINK=#80 ALINK=#FF - H1 ALIGN=CENTER - It Worked! The Apache Web Server is Installed on this Web Site! - /H1 - P - If you can see this page, then the people who own this domain have just - installed the A HREF=http://www.apache.org/httpd;Apache Web server/A - software successfully. They now have to add content to this directory - and replace this placeholder page, or else point the server at their real - content. - /P - HR - BLOCKQUOTE - If you are seeing this page instead of the site you expected, please - STRONGcontact the administrator of the site involved./STRONG - (Try sending mail to SAMPlt;Webmaster@EMdomain/EMgt;/SAMP.) - Although this site is - running the Apache software it almost certainly has no other connection - to the Apache Group, so please do not send mail about this site or its - contents to the Apache authors. If you do, your message will be - STRONGBIGignored/BIG/STRONG. - /BLOCKQUOTE - HR - P - The Apache - A - HREF=manual/index.html - documentation/A - has been included with this distribution. - /P - P - The Webmaster of this site is free to use the image below on - an Apache-powered Web server. Thanks for using Apache! - /P - DIV ALIGN=CENTER - IMG SRC=apache_pb.gif ALT= - /DIV - /BODY + + +P +If you can see this, it means that the installation of the A HREF=http://www.apache.org/;Apache/A web server software on this system was successful. You may now add content to this directory and replace this page. + +PHR WIDTH=50% SIZE=8 + +H2 ALIGN=CENTERSeeing this instead of the website you expected?/H2 + +P +This page is here because the site administrator has changed the configuration of this web server. +Please STRONGcontact the person responsible for maintaining this server with questions./STRONG The Apache Software Foundation, which wrote the web server software this site administrator is using, has nothing to do with maintaining this site and cannot
Re: protocol/4716: Server send invalid response if chunked transfer has chunk larger than 4095 bytes.
[In order for any reply to be added to the PR database, you need] [to include [EMAIL PROTECTED] in the Cc line and make sure the] [subject line starts with the report component and number, with ] [or without any 'Re:' prefixes (such as general/1098: or ] [Re: general/1098:). If the subject doesn't match this ] [pattern, your message will be misfiled and ignored. The ] [apbugs address is not added to the Cc line of messages from ] [the database automatically because of the potential for mail ] [loops. If you do not include this Cc, your reply may be ig- ] [nored unless you are responding to an explicit request from a ] [developer. Reply only with text; DO NOT SEND ATTACHMENTS! ] Synopsis: Server send invalid response if chunked transfer has chunk larger than 4095 bytes. Comment-Added-By: dgaudet Comment-Added-When: Thu Aug 12 19:05:23 PDT 1999 Comment-Added: user error. DEFAULT_BUFSIZE was set to 8192 without changing the CHUNK_HEADER_SIZE define as documented in buff.c. yeah maybe there should be an assertion, however people playing with constants in the code should read the comments... Dean
cvs commit: apache-1.3/src/test check_chunked
dgaudet 99/08/12 17:51:35
Modified:src/test check_chunked
Log:
newer perls complain about \r in hex, whatever
Revision ChangesPath
1.3 +2 -2 apache-1.3/src/test/check_chunked
Index: check_chunked
===
RCS file: /home/cvs/apache-1.3/src/test/check_chunked,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- check_chunked 1998/02/07 21:14:18 1.2
+++ check_chunked 1999/08/13 00:51:35 1.3
@@ -24,9 +24,9 @@
for(;;) {
$_ = || die unexpected end of file!\n;
-m#^[0-9a-f]+ *\r$#i || die bogus chunklen: $_;
+m#^([0-9a-f]+) *\r$#i || die bogus chunklen: $_;
-my $chunklen = hex;
+my $chunklen = hex($1);
exit 0 if ($chunklen == 0);
Re: protocol/4716: Server send invalid response if chunked transfer has chunk larger than 4095 bytes.
[In order for any reply to be added to the PR database, you need] [to include [EMAIL PROTECTED] in the Cc line and make sure the] [subject line starts with the report component and number, with ] [or without any 'Re:' prefixes (such as general/1098: or ] [Re: general/1098:). If the subject doesn't match this ] [pattern, your message will be misfiled and ignored. The ] [apbugs address is not added to the Cc line of messages from ] [the database automatically because of the potential for mail ] [loops. If you do not include this Cc, your reply may be ig- ] [nored unless you are responding to an explicit request from a ] [developer. Reply only with text; DO NOT SEND ATTACHMENTS! ] Synopsis: Server send invalid response if chunked transfer has chunk larger than 4095 bytes. State-Changed-From-To: open-feedback State-Changed-By: dgaudet State-Changed-When: Thu Aug 12 13:00:19 PDT 1999 State-Changed-Why: hmm, i can't reproduce the problem with the method you gave -- i created a few files, one size 4096, one size 32768, i removed set_content_length() from default_handler... and the chunked responses were correct. i've gone through this code a few times... it's possible there's still a bug... if you can get me a working test case though that'd be great. Dean
cvs commit: apache-2.0/mpm/src/support/SHA1 - New directory
dgaudet 99/08/05 17:50:56 apache-2.0/mpm/src/support/SHA1 - New directory
cvs commit: apache-2.0/mpm/src/support/SHA1 README.sha1 convert-sha1.pl htpasswd-sha1.pl ldif-sha1.example
dgaudet 99/08/05 17:56:10
Modified:mpm INSTALL Makefile.tmpl config.layout configure
mpm/src .gdbinit ApacheCore.dsp ApacheCore.mak
Configuration.tmpl Configure
mpm/src/ap Makefile.tmpl ap_md5c.c
mpm/src/helpers GuessOS TestCompile buildinfo.sh mkshadow.sh
mpm/src/include ap.h ap_config.h ap_md5.h ap_mmn.h
http_conf_globals.h http_core.h httpd.h
mpm/src/main buff.c http_connection.c http_core.c
http_main.c http_protocol.c rfc1413.c util.c
util_script.c util_uri.c
mpm/src/modules/mpm/prefork prefork.c
mpm/src/modules/proxy ApacheModuleProxy.dsp
ApacheModuleProxy.mak proxy_cache.c
mpm/src/modules/standard .cvsignore mod_auth.c mod_auth_db.c
mod_auth_dbm.c mod_cgi.c mod_log_config.c
mod_rewrite.c mod_rewrite.h
mpm/src/os/bs2000 Makefile.tmpl bs2login.c os.h
mpm/src/os/tpf os.c os.h
mpm/src/os/unix unixd.c
mpm/src/os/win32 ApacheModuleRewrite.dsp
ApacheModuleRewrite.mak os.h registry.c
mpm/src/regex debug.c main.c split.c
mpm/src/support Makefile.tmpl README ab.c apxs.8 apxs.pl
htdigest.c htpasswd.1 htpasswd.c httpd.8 httpd.exp
suexec.c
Added: mpm/src/ap ap_checkpass.c ap_sha1.c
mpm/src/include ap_sha1.h
mpm/src/modules/standard mod_vhost_alias.c
mpm/src/support/SHA1 README.sha1 convert-sha1.pl
htpasswd-sha1.pl ldif-sha1.example
Log:
merge the differences in apache-1.3 from tag apache-apr-merge-3 up
to mpm-merge-1 onto the mpm tree
prior to the merge, the mpm tree was tagged with apache-1_3-merge-1-pre
and after the merge, the mpm tree will be tagged with apache-1_3-merge-1-post
note: none of htdocs/manual is present in mpm at this point.
Revision ChangesPath
1.2 +2 -2 apache-2.0/mpm/INSTALL
Index: INSTALL
===
RCS file: /home/cvs/apache-2.0/mpm/INSTALL,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- INSTALL 1999/06/18 18:39:11 1.1
+++ INSTALL 1999/08/06 00:53:52 1.2
@@ -83,7 +83,7 @@
- FreeBSD - Solaris - AIX - Mac OS
- OpenBSD - IRIX - SCO - OpenStep/Mach
- NetBSD- HPUX - ReliantUNIX
- - BSDI - Digital Unix
+ - BSDI - Digital Unix - DGUX
o Entirely unsupported platforms are:
- Ultrix
@@ -326,7 +326,7 @@
this way implicitly enables them itself).
Note 1: The --enable-shared option DOES NOT AUTOMATICALLY enable the
- module because there are variants like `--enable-shared=all'
+ module because there are variants like `--enable-shared=max'
which should not imply `--enable-module=all'.
Note 2: Per default the DSO mechanism is globally disabled, i.e. no
1.2 +7 -0 apache-2.0/mpm/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /home/cvs/apache-2.0/mpm/Makefile.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.tmpl 1999/06/18 18:39:11 1.1
+++ Makefile.tmpl 1999/08/06 00:53:52 1.2
@@ -259,6 +259,7 @@
$(MKDIR) $(root)$(iconsdir)
$(MKDIR) $(root)$(cgidir)
$(MKDIR) $(root)$(includedir)
+ $(MKDIR) $(root)$(includedir)/xml
$(MKDIR) $(root)$(runtimedir)
$(MKDIR) $(root)$(logfiledir)
$(MKDIR) $(root)$(proxycachedir)
@@ -277,6 +278,11 @@
[EMAIL PROTECTED] [ .`grep '^[ ]*AddModule.*mod_so\.o'
$(TOP)/$(SRC)/Configuration.apaci` != . ]; then \
echo $(INSTALL_CORE) $(TOP)/$(SRC)/$(TARGET)
$(root)$(sbindir)/$(TARGET); \
$(INSTALL_CORE) $(TOP)/$(SRC)/$(TARGET)
$(root)$(sbindir)/$(TARGET); \
+ SHLIB_EXPORT_FILES=`grep '^SHLIB_EXPORT_FILES='
$(TOP)/$(SRC)/Makefile | sed -e 's:^.*=::'`; \
+ if [ .$${SHLIB_EXPORT_FILES} != . ]; then \
+ $(CP) $(TOP)/$(SRC)/support/httpd.exp
$(root)$(libexecdir)/; \
+ chmod 644 $(root)$(libexecdir)/httpd.exp; \
+ fi; \
else \
echo $(INSTALL_PROGRAM) $(TOP)/$(SRC)/$(TARGET)
$(root)$(sbindir)/$(TARGET); \
$(INSTALL_PROGRAM) $(TOP)/$(SRC)/$(TARGET)
$(root)$(sbindir)/$(TARGET); \
@@ -422,6 +428,7 @@
install-include:
@echo === [include: Installing
cvs commit: apache-2.0/mpm/src/modules/standard mod_include.c
dgaudet 99/08/05 18:09:39
Modified:mpm/src/modules/standard mod_include.c
Log:
doc TODO
Revision ChangesPath
1.5 +3 -16 apache-2.0/mpm/src/modules/standard/mod_include.c
Index: mod_include.c
===
RCS file: /home/cvs/apache-2.0/mpm/src/modules/standard/mod_include.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_include.c 1999/07/27 12:05:08 1.4
+++ mod_include.c 1999/08/06 01:09:38 1.5
@@ -111,6 +111,9 @@
/* just need some arbitrary non-NULL pointer which can't also be a
request_rec */
#define NESTED_INCLUDE_MAGIC (includes_module)
+/* TODO: changing directory should be handled by CreateProcess */
+#define ap_chdir_file(x) do {} while(0)
+
/* Environment function --
*/
/* XXX: could use ap_table_overlap here */
@@ -614,10 +617,7 @@
}
ap_destroy_sub_req(rr);
-/* changing directory should be handled by CreateProcess.
- #ifndef WIN32
ap_chdir_file(r-filename);
-#endif */
return 0;
}
@@ -737,10 +737,7 @@
if (!error_fmt ap_run_sub_req(rr)) {
error_fmt = unable to include \%s\ in parsed file %s;
}
-/* changing directory should be handled by CreateProcess.
- #ifndef WIN32
ap_chdir_file(r-filename);
- #endif*/
if (error_fmt) {
ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR,
r, error_fmt, tag_val, r-filename);
@@ -897,10 +894,7 @@
ap_rputs(error, r);
}
/* just in case some stooge changed directories */
-/* changing directory should be handled by CreateProcess.
-#ifndef WIN32
ap_chdir_file(r-filename);
- #endif*/
}
else if (!strcmp(tag, cgi)) {
parse_string(r, tag_val, parsed_string, sizeof(parsed_string),
0);
@@ -909,11 +903,7 @@
invalid CGI ref \%s\ in %s, tag_val, file);
ap_rputs(error, r);
}
-/* grumble groan */
- /* changing directory should be handled by CreateProcess.
-#ifndef WIN32
ap_chdir_file(r-filename);
- #endif*/
}
else if (!strcmp(tag, done)) {
return 0;
@@ -2163,10 +2153,7 @@
printing = conditional_status = 1;
if_nesting = 0;
-/* changing directory should be handled by CreateProcess.
-#ifndef WIN32
ap_chdir_file(r-filename);
-#endif*/
if (r-args) { /* add QUERY stuff to env cause it ain't yet
*/
char *arg_copy = ap_pstrdup(r-pool, r-args);
cvs commit: apache-1.3/src/modules/standard mod_access.c
dgaudet 99/08/05 18:37:59
Modified:src CHANGES
src/modules/standard mod_access.c
Log:
CIDR addresses such as a.b.c.d/24 where d != 0 weren't handled
properly... mask off the host bits of the address.
PR: 4770
Submitted by: Paul J. Reder [EMAIL PROTECTED]
Revision ChangesPath
1.1410+4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1409
retrieving revision 1.1410
diff -u -r1.1409 -r1.1410
--- CHANGES 1999/08/03 09:27:25 1.1409
+++ CHANGES 1999/08/06 01:37:56 1.1410
@@ -1,5 +1,9 @@
Changes with Apache 1.3.8
+ *) CIDR addresses such as a.b.c.d/24 where d != 0 weren't handled
+ properly in mod_access.
+ [Paul J. Reder [EMAIL PROTECTED]] PR#4770
+
*) RewriteLock/RewriteMap didn't work properly with virtual hosts.
[Dmitry Khrustalev [EMAIL PROTECTED]] PR#3874
1.39 +1 -1 apache-1.3/src/modules/standard/mod_access.c
Index: mod_access.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_access.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- mod_access.c 1999/01/01 19:05:06 1.38
+++ mod_access.c 1999/08/06 01:37:58 1.39
@@ -202,7 +202,7 @@
mask = htonl(mask);
}
a-x.ip.mask = mask;
-
+a-x.ip.net = (a-x.ip.net mask); /* pjr - This fixes PR 4770 */
}
else if (ap_isdigit(*where) is_ip(where)) {
/* legacy syntax for ip addrs: a.b.c. == a.b.c.0/24 for example */
cvs commit: apache-2.0/mpm/src/main alloc.c
dgaudet 99/08/05 18:56:25
Modified:mpm/src/main alloc.c
Log:
Remove a difference with 1.3's alloc.c ... the root_pool stuff was an
experiment I tried with apache-nspr, and it really didn't win much.
The idea was to have a free list per thread. But in practice that's
too many free lists, too much memory sitting around doing squat. If
we have lock contention on the alloc mutex then we might consider a
handful, say 8, free lists, and use tid % 8 to figure out which one
to go after.
Revision ChangesPath
1.7 +23 -50apache-2.0/mpm/src/main/alloc.c
Index: alloc.c
===
RCS file: /home/cvs/apache-2.0/mpm/src/main/alloc.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- alloc.c 1999/07/06 21:32:09 1.6
+++ alloc.c 1999/08/06 01:56:25 1.7
@@ -179,7 +179,6 @@
struct process_chain;
struct cleanup;
-struct root_pool;
struct pool {
union block_hdr *first;
@@ -190,7 +189,6 @@
struct pool *sub_next;
struct pool *sub_prev;
struct pool *parent;
-struct root_pool *thread_root; /* the root pool for this thread */
char *free_first_avail;
#ifdef ALLOC_USE_MALLOC
void *allocation_list;
@@ -200,13 +198,6 @@
#endif
};
-/* there's really no difference between a root_pool and a regular pool
- * at the moment.
- */
-typedef struct root_pool {
-struct pool p;
-} root_pool;
-
static union block_hdr *block_freelist = NULL;
static ap_thread_mutex *alloc_mutex;
@@ -320,7 +311,7 @@
#endif
-static void free_blocks(root_pool *root,union block_hdr *blok)
+static void free_blocks(union block_hdr *blok)
{
#ifdef ALLOC_USE_MALLOC
union block_hdr *next;
@@ -422,7 +413,7 @@
return blok;
}
-static ap_inline union block_hdr *new_local_block(root_pool *root, int
min_size)
+static ap_inline union block_hdr *new_local_block(int min_size)
{
union block_hdr *blok;
@@ -465,32 +456,6 @@
* gets taken off the parent's sub-pool list...
*/
-#define ROOT_HDR_CLICKS (1 + ((sizeof(struct root_pool) - 1) / CLICK_SZ))
-#define ROOT_HDR_BYTES (ROOT_HDR_CLICKS * CLICK_SZ)
-
-API_EXPORT(struct pool *) ap_make_root_pool(void)
-{
-union block_hdr *blok;
-root_pool *new_pool;
-
-(void) ap_thread_mutex_lock(alloc_mutex);
-
-blok = new_block(ROOT_HDR_BYTES);
-new_pool = (root_pool *) blok-h.first_avail;
-blok-h.first_avail += ROOT_HDR_BYTES;
-#ifdef POOL_DEBUG
-blok-h.owning_pool = (new_pool-p);
-#endif
-
-memset(new_pool, 0, sizeof(*new_pool));
-new_pool-p.free_first_avail = blok-h.first_avail;
-new_pool-p.first = new_pool-p.last = blok;
-new_pool-p.thread_root = new_pool;
-
-(void) ap_thread_mutex_unlock(alloc_mutex);
-return (pool *)new_pool;
-}
-
static pool *permanent_pool;
/* Each pool structure is allocated in the start of its own first block,
@@ -508,7 +473,7 @@
union block_hdr *blok;
pool *new_pool;
-blok = new_local_block(p-thread_root, POOL_HDR_BYTES);
+blok = new_local_block(POOL_HDR_BYTES);
new_pool = (pool *) blok-h.first_avail;
blok-h.first_avail += POOL_HDR_BYTES;
#ifdef POOL_DEBUG
@@ -519,12 +484,13 @@
new_pool-free_first_avail = blok-h.first_avail;
new_pool-first = new_pool-last = blok;
-new_pool-thread_root = p-thread_root;
-new_pool-parent = p;
-new_pool-sub_next = p-sub_pools;
-if (new_pool-sub_next)
- new_pool-sub_next-sub_prev = new_pool;
-p-sub_pools = new_pool;
+if (p) {
+ new_pool-parent = p;
+ new_pool-sub_next = p-sub_pools;
+ if (new_pool-sub_next)
+ new_pool-sub_next-sub_prev = new_pool;
+ p-sub_pools = new_pool;
+}
return new_pool;
}
@@ -569,7 +535,7 @@
#ifdef WIN32
spawn_mutex = ap_thread_mutex_new();
#endif
-permanent_pool = ap_make_root_pool();
+permanent_pool = ap_make_sub_pool(NULL);
#ifdef ALLOC_STATS
atexit(dump_stats);
#endif
@@ -591,7 +557,7 @@
a-cleanups = NULL;
free_proc_chain(a-subprocesses);
a-subprocesses = NULL;
-free_blocks(a-thread_root, a-first-h.next);
+free_blocks(a-first-h.next);
a-first-h.next = NULL;
a-last = a-first;
@@ -616,6 +582,15 @@
{
ap_clear_pool(a);
+/* XXX: I don't think this mutex is required here. In theory,
+ our plan is that upon thread creation, the creator thread
+ will create a pool A which it will hand the created thread.
+ The created thread then can create any subpools of A it
+ wants, and it doesn't need any locks to do this... and it
+ can destroy any subpool of A it desires -- it just can't
+ destroy A itself. When
cvs commit: apache-1.3/src/main http_config.c
dgaudet 99/08/06 09:21:34 Modified:src CHANGES src/main http_config.c Log: Fix a memory leak where the module counts were getting messed up across restarts. Submitted by: David Harris [EMAIL PROTECTED] Revision ChangesPath 1.1411+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1410 retrieving revision 1.1411 diff -u -r1.1410 -r1.1411 --- CHANGES 1999/08/06 01:37:56 1.1410 +++ CHANGES 1999/08/06 16:21:28 1.1411 @@ -1,5 +1,8 @@ Changes with Apache 1.3.8 + *) Fix a memory leak where the module counts were getting messed + up across restarts. [David Harris [EMAIL PROTECTED]] + *) CIDR addresses such as a.b.c.d/24 where d != 0 weren't handled properly in mod_access. [Paul J. Reder [EMAIL PROTECTED]] PR#4770 1.146 +1 -0 apache-1.3/src/main/http_config.c Index: http_config.c === RCS file: /home/cvs/apache-1.3/src/main/http_config.c,v retrieving revision 1.145 retrieving revision 1.146 diff -u -r1.145 -r1.146 --- http_config.c 1999/05/07 00:16:11 1.145 +++ http_config.c 1999/08/06 16:21:33 1.146 @@ -625,6 +625,7 @@ m-module_index = -1;/* simulate being unloaded, should * be unnecessary */ dynamic_modules--; +total_modules--; } API_EXPORT(void) ap_add_loaded_module(module *mod)
Re: mod_access/3454: AllowOverride Limit ignored for regex Directory ~ in access.conf
[In order for any reply to be added to the PR database, you need] [to include [EMAIL PROTECTED] in the Cc line and make sure the] [subject line starts with the report component and number, with ] [or without any 'Re:' prefixes (such as general/1098: or ] [Re: general/1098:). If the subject doesn't match this ] [pattern, your message will be misfiled and ignored. The ] [apbugs address is not added to the Cc line of messages from ] [the database automatically because of the potential for mail ] [loops. If you do not include this Cc, your reply may be ig- ] [nored unless you are responding to an explicit request from a ] [developer. Reply only with text; DO NOT SEND ATTACHMENTS! ] Synopsis: AllowOverride Limit ignored for regex Directory ~ in access.conf State-Changed-From-To: open-feedback State-Changed-By: dgaudet State-Changed-When: Thu Aug 5 10:31:48 PDT 1999 State-Changed-Why: This is actually how things are documented -- .htaccess occurs while the non-regex directory sections are parsed. Try using Directory /home/*/web-docs Dean
Re: mod_access/3019: Re: unable to overide allow/deny
[In order for any reply to be added to the PR database, you need] [to include [EMAIL PROTECTED] in the Cc line and make sure the] [subject line starts with the report component and number, with ] [or without any 'Re:' prefixes (such as general/1098: or ] [Re: general/1098:). If the subject doesn't match this ] [pattern, your message will be misfiled and ignored. The ] [apbugs address is not added to the Cc line of messages from ] [the database automatically because of the potential for mail ] [loops. If you do not include this Cc, your reply may be ig- ] [nored unless you are responding to an explicit request from a ] [developer. Reply only with text; DO NOT SEND ATTACHMENTS! ] Synopsis: Re: unable to overide allow/deny State-Changed-From-To: open-feedback State-Changed-By: dgaudet State-Changed-When: Thu Aug 5 10:32:52 PDT 1999 State-Changed-Why: Try using Directory /usr/home/* without the ~ Dean
Re: mod_rewrite/3874: RewriteLock doesn't work for virtual hosts and silently fails
[In order for any reply to be added to the PR database, you need] [to include [EMAIL PROTECTED] in the Cc line and make sure the] [subject line starts with the report component and number, with ] [or without any 'Re:' prefixes (such as general/1098: or ] [Re: general/1098:). If the subject doesn't match this ] [pattern, your message will be misfiled and ignored. The ] [apbugs address is not added to the Cc line of messages from ] [the database automatically because of the potential for mail ] [loops. If you do not include this Cc, your reply may be ig- ] [nored unless you are responding to an explicit request from a ] [developer. Reply only with text; DO NOT SEND ATTACHMENTS! ] Synopsis: RewriteLock doesn't work for virtual hosts and silently fails State-Changed-From-To: analyzed-closed State-Changed-By: dgaudet State-Changed-When: Tue Aug 3 11:17:29 PDT 1999 State-Changed-Why: A patch has been applied to 1.3.8-dev which should fix this... 1.3.8 should be out shortly. Dean
cvs commit: apache-1.3/src/modules/standard mod_rewrite.c mod_rewrite.h
dgaudet 99/08/03 02:27:42
Modified:src CHANGES
src/modules/standard mod_rewrite.c mod_rewrite.h
Log:
This patch includes fix for rewritelock in vhost problem and makes program
map writes atomic if writev is available.
-Dima
PR: 3874
Submitted by: Dmitry Khrustalev [EMAIL PROTECTED]
Revision ChangesPath
1.1409+4 -1 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1408
retrieving revision 1.1409
diff -u -r1.1408 -r1.1409
--- CHANGES 1999/08/02 10:48:11 1.1408
+++ CHANGES 1999/08/03 09:27:25 1.1409
@@ -1,6 +1,9 @@
Changes with Apache 1.3.8
- * Support for compaq/tandem/com.
+ *) RewriteLock/RewriteMap didn't work properly with virtual hosts.
+ [Dmitry Khrustalev [EMAIL PROTECTED]] PR#3874
+
+ *) Support for compaq/tandem/com.
[Ottati, Michael [EMAIL PROTECTED], dirkx]
*) Added SHA1 password encryption support to easy migration from
1.144 +35 -49apache-1.3/src/modules/standard/mod_rewrite.c
Index: mod_rewrite.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- mod_rewrite.c 1999/07/29 17:54:06 1.143
+++ mod_rewrite.c 1999/08/03 09:27:33 1.144
@@ -91,6 +91,10 @@
#include mod_rewrite.h
+#ifndef NO_WRITEV
+#include sys/types.h
+#include sys/uio.h
+#endif
/*
** +---+
@@ -208,6 +212,8 @@
/* whether proxy module is available or not */
static int proxy_available;
+static char *lockname;
+static int lockfd = -1;
/*
** +---+
@@ -234,8 +240,6 @@
a-rewritelogfile = NULL;
a-rewritelogfp= -1;
a-rewriteloglevel = 0;
-a-rewritelockfile = NULL;
-a-rewritelockfp = -1;
a-rewritemaps = ap_make_array(p, 2, sizeof(rewritemap_entry));
a-rewriteconds= ap_make_array(p, 2, sizeof(rewritecond_entry));
a-rewriterules= ap_make_array(p, 2, sizeof(rewriterule_entry));
@@ -270,12 +274,6 @@
a-rewritelogfp= overrides-rewritelogfp != -1
? overrides-rewritelogfp
: base-rewritelogfp;
-a-rewritelockfile = overrides-rewritelockfile != NULL
- ? overrides-rewritelockfile
- : base-rewritelockfile;
-a-rewritelockfp = overrides-rewritelockfp != -1
- ? overrides-rewritelockfp
- : base-rewritelockfp;
a-rewritemaps = ap_append_arrays(p, overrides-rewritemaps,
base-rewritemaps);
a-rewriteconds= ap_append_arrays(p, overrides-rewriteconds,
@@ -291,8 +289,6 @@
a-rewriteloglevel = overrides-rewriteloglevel;
a-rewritelogfile = overrides-rewritelogfile;
a-rewritelogfp= overrides-rewritelogfp;
-a-rewritelockfile = overrides-rewritelockfile;
-a-rewritelockfp = overrides-rewritelockfp;
a-rewritemaps = overrides-rewritemaps;
a-rewriteconds= overrides-rewriteconds;
a-rewriterules= overrides-rewriterules;
@@ -528,15 +524,12 @@
static const char *cmd_rewritelock(cmd_parms *cmd, void *dconf, char *a1)
{
-rewrite_server_conf *sconf;
const char *error;
if ((error = ap_check_cmd_context(cmd, GLOBAL_ONLY)) != NULL)
return error;
-sconf = (rewrite_server_conf *)
-ap_get_module_config(cmd-server-module_config,
rewrite_module);
-sconf-rewritelockfile = a1;
+lockname = a1;
return NULL;
}
@@ -2920,6 +2913,9 @@
char buf[LONG_STRING_LEN];
char c;
int i;
+#ifndef NO_WRITEV
+struct iovec iov[2];
+#endif
/* when `RewriteEngine off' was used in the per-server
* context then the rewritemap-programs were not spawned.
@@ -2934,8 +2930,16 @@
rewritelock_alloc(r);
/* write out the request key */
+#ifdef NO_WRITEV
write(fpin, key, strlen(key));
write(fpin, \n, 1);
+#else
+iov[0].iov_base = key;
+iov[0].iov_len = strlen(key);
+iov[1].iov_base = \n;
+iov[1].iov_len = 1;
+writev(fpin, iov, 2);
+#endif
/* read in the response value */
i = 0;
@@ -3254,28 +3258,26 @@
conf = ap_get_module_config(s-module_config, rewrite_module);
/* only operate if a lockfile is used */
-if (conf-rewritelockfile
cvs commit: apache-1.3 STATUS
dgaudet 99/07/29 10:55:57 Modified:.STATUS Log: I don't see how this is a show stopper, sorry. This is a client bug, and we already have force-no-vary as a method to work around those clients. Revision ChangesPath 1.729 +4 -4 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.728 retrieving revision 1.729 diff -u -r1.728 -r1.729 --- STATUS1999/07/29 17:53:36 1.728 +++ STATUS1999/07/29 17:55:54 1.729 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/07/29 17:53:36 $] + Last modified at [$Date: 1999/07/29 17:55:54 $] Release: @@ -64,6 +64,8 @@ mips-dec-ultrix4.4no Sameer Parekh mips-unknown-linuxyes Lars Eilebrecht +RELEASE SHOWSTOPPERS: + * The Vary header field stuff is still broken (multiple entries occur, etc.). The result is that some browsers (AFAIK at least MSIE) are horribly confused by the responses. @@ -72,7 +74,7 @@ archive: Ken, Ralf and Roy have already found consensus in the past there. -RELEASE SHOWSTOPPERS: +RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: * The Vary header field stuff is still broken (multiple entries occur, etc.). The result is that some browsers (AFAIK at least @@ -81,8 +83,6 @@ how it should be done, please look at new-httpd mailing list archive: Ken, Ralf and Roy have already found consensus in the past there. - -RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: * Graham Legget has found that if he uses the 1.3.7-dev core, and the 1.3.6 proxy code (plus a small patch of his) he doesn't get
cvs commit: apache-2.0/mpm/src/modules/standard mod_access.c mod_actions.c mod_alias.c mod_asis.c mod_auth.c mod_autoindex.c mod_cgi.c mod_dir.c mod_echo.c mod_env.c mod_imap.c mod_include.c mod_log_config.c mod_mime.c mod_negotiation.c mod_setenvif.c mod_userdir.c
dgaudet 99/07/27 05:05:15
Modified:mpm/src/include http_config.h
mpm/src/main http_config.c http_core.c http_main.c
http_vhost.c
mpm/src/modules/mpm/dexter dexter.c
mpm/src/modules/mpm/mpmt_pthread mpmt_pthread.c
mpm/src/modules/mpm/prefork prefork.c
mpm/src/modules/mpm/spmt_os2 spmt_os2.c
mpm/src/modules/standard mod_access.c mod_actions.c
mod_alias.c mod_asis.c mod_auth.c mod_autoindex.c
mod_cgi.c mod_dir.c mod_echo.c mod_env.c mod_imap.c
mod_include.c mod_log_config.c mod_mime.c
mod_negotiation.c mod_setenvif.c mod_userdir.c
Log:
- get rid of pre_command_line_hook ... use register_hooks for this purpose
- get rid of optreset... screw -D, use environment variables ONE_PROCESS,
SHOW_HOOKS, DUMP_VHOSTS, ... at least it builds this way :)
Revision ChangesPath
1.11 +0 -2 apache-2.0/mpm/src/include/http_config.h
Index: http_config.h
===
RCS file: /home/cvs/apache-2.0/mpm/src/include/http_config.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- http_config.h 1999/07/24 18:38:37 1.10
+++ http_config.h 1999/07/27 12:04:59 1.11
@@ -211,7 +211,6 @@
* (see also mod_so).
*/
-void (*pre_command_line)(pool *pcommands);
void (*pre_config)(pool *pconf, pool *plog, pool *ptemp);
void (*open_logs)(pool *pconf, pool *plog, pool *ptemp, server_rec *);
void (*post_config)(pool *pconf, pool *plog, pool *ptemp, server_rec *);
@@ -334,7 +333,6 @@
void ap_setup_prelinked_modules(void);
void ap_show_directives(void);
void ap_show_modules(void);
-void ap_pre_command_line_hook(pool *pcommands);
void ap_pre_config_hook(pool *pconf, pool *plog, pool *ptemp);
server_rec *ap_read_config(pool *conf_pool, pool *temp_pool, const char
*config_name);
void ap_open_logs_hook(pool *pconf, pool *plog, pool *ptemp, server_rec *s);
1.14 +1 -10 apache-2.0/mpm/src/main/http_config.c
Index: http_config.c
===
RCS file: /home/cvs/apache-2.0/mpm/src/main/http_config.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- http_config.c 1999/07/24 18:38:46 1.13
+++ http_config.c 1999/07/27 12:05:00 1.14
@@ -496,7 +496,7 @@
{
if(m-register_hooks)
{
- if(ap_exists_config_define(SHOW_HOOKS))
+ if(getenv(SHOW_HOOKS))
{
printf(Registering hooks for %s\n,m-name);
g_bDebugHooks=1;
@@ -1435,15 +1435,6 @@
if (m-create_dir_config)
ap_set_module_config(s-lookup_defaults, m,
(*m-create_dir_config)(p, NULL));
-}
-
-void ap_pre_command_line_hook(pool *pcommands)
-{
-module *m;
-
-for (m = top_module; m; m = m-next)
- if (m-pre_command_line)
- (*m-pre_command_line) (pcommands);
}
void ap_pre_config_hook(pool *pconf, pool *plog, pool *ptemp)
1.12 +0 -1 apache-2.0/mpm/src/main/http_core.c
Index: http_core.c
===
RCS file: /home/cvs/apache-2.0/mpm/src/main/http_core.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- http_core.c 1999/07/25 14:24:01 1.11
+++ http_core.c 1999/07/27 12:05:00 1.12
@@ -2649,7 +2649,6 @@
API_VAR_EXPORT module core_module = {
STANDARD20_MODULE_STUFF,
-NULL,/* pre_command_line */
NULL,/* pre_config */
NULL,/* post_config */
core_open_logs, /* open_logs */
1.5 +0 -15 apache-2.0/mpm/src/main/http_main.c
Index: http_main.c
===
RCS file: /home/cvs/apache-2.0/mpm/src/main/http_main.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- http_main.c 1999/07/10 13:32:47 1.4
+++ http_main.c 1999/07/27 12:05:00 1.5
@@ -247,9 +247,7 @@
pool *ptemp; /* Pool for temporart config stuff */
pool *pcommands; /* Pool for -C and -c switches */
extern char *optarg;
-extern int optind,optreset;
-
/* TODO: PATHSEPARATOR should be one of the os defines */
#define PATHSEPARATOR '/'
if ((s = strrchr(argv[0], PATHSEPARATOR)) != NULL) {
@@ -270,21 +268,8 @@
ap_server_post_read_config = ap_make_array(pcommands, 1, sizeof(char *));
ap_server_config_defines = ap_make_array
cvs commit: apache-2.0/mpm/src/os/beos beosd.c
dgaudet 99/07/26 00:03:10
Modified:mpm/src/main listen.c
mpm/src/os/beos beosd.c
Log:
some bug fixes from David
Submitted by: David Reid [EMAIL PROTECTED]
Revision ChangesPath
1.4 +1 -1 apache-2.0/mpm/src/main/listen.c
Index: listen.c
===
RCS file: /home/cvs/apache-2.0/mpm/src/main/listen.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- listen.c 1999/06/29 02:49:26 1.3
+++ listen.c 1999/07/26 07:03:09 1.4
@@ -121,7 +121,7 @@
*
* If no size is specified, use the kernel default.
*/
-#ifndef SO_SNDBUF
+#ifdef SO_SNDBUF
if (send_buffer_size) {
if (setsockopt(s, SOL_SOCKET, SO_SNDBUF,
(char *) send_buffer_size, sizeof(int)) 0) {
1.2 +0 -8 apache-2.0/mpm/src/os/beos/beosd.c
Index: beosd.c
===
RCS file: /home/cvs/apache-2.0/mpm/src/os/beos/beosd.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- beosd.c 1999/07/12 22:51:13 1.1
+++ beosd.c 1999/07/26 07:03:09 1.2
@@ -79,19 +79,11 @@
}
RAISE_SIGSTOP(DETACH);
-#ifndef NO_SETSID
if ((pgrp = setsid()) == -1) {
perror(setsid);
fprintf(stderr, %s: setsid failed\n, ap_server_argv0);
exit(1);
}
-#else
-if ((pgrp = setpgrp(getpid(), 0)) == -1) {
- perror(setpgrp);
- fprintf(stderr, %s: setpgrp failed\n, ap_server_argv0);
- exit(1);
-}
-#endif
/* close out the standard file descriptors */
if (freopen(/dev/null, r, stdin) == NULL) {
cvs commit: apache-2.0/mpm/src/os/beos - New directory
dgaudet 99/07/12 15:48:54 apache-2.0/mpm/src/os/beos - New directory
cvs commit: apache-2.0/mpm/src/os/beos Makefile.tmpl beosd.c beosd.h iol_socket.c iol_socket.h os-inline.c os.c os.h
dgaudet 99/07/12 15:51:17
Modified:mpm/src CHANGES Configure
mpm/src/include ap_config.h httpd.h
mpm/src/main util.c
Added: mpm/src/os/beos Makefile.tmpl beosd.c beosd.h iol_socket.c
iol_socket.h os-inline.c os.c os.h
Log:
commit David's beos port.
Submitted by: David Reid [EMAIL PROTECTED]
Revision ChangesPath
1.13 +2 -0 apache-2.0/mpm/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-2.0/mpm/src/CHANGES,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- CHANGES 1999/07/05 13:00:39 1.12
+++ CHANGES 1999/07/12 22:51:05 1.13
@@ -1,5 +1,7 @@
Changes with MPM
+* MPM BEOS port. [David Reid [EMAIL PROTECTED]]
+
* Start to implement module-defined hooks that are a) fast and b)
typesafe.
Replace pre_connection module call with a register_hook call and
implement pre_connection as a hook. The intent is that these hooks will
1.12 +2 -1 apache-2.0/mpm/src/Configure
Index: Configure
===
RCS file: /home/cvs/apache-2.0/mpm/src/Configure,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Configure 1999/07/11 14:49:03 1.11
+++ Configure 1999/07/12 22:51:06 1.12
@@ -729,7 +729,8 @@
OS='BeOS';
CFLAGS=$CFLAGS -DBEOS
DEF_WANTHSREGEX=yes
- ;;
+ OSDIR='os/beos'
+ ;;
4850-*.*)
OS='NCR MP/RAS'
CFLAGS=$CFLAGS -DSVR4 -DMPRAS
1.3 +3 -0 apache-2.0/mpm/src/include/ap_config.h
Index: ap_config.h
===
RCS file: /home/cvs/apache-2.0/mpm/src/include/ap_config.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ap_config.h 1999/07/12 08:47:47 1.2
+++ ap_config.h 1999/07/12 22:51:08 1.3
@@ -877,6 +877,9 @@
#elif defined(BEOS)
#include stddef.h
+#include kernel/OS.h
+#include kernel/image.h
+#include sys/uio.h
#define NO_WRITEV
#define NO_KILLPG
1.6 +3 -0 apache-2.0/mpm/src/include/httpd.h
Index: httpd.h
===
RCS file: /home/cvs/apache-2.0/mpm/src/include/httpd.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- httpd.h 1999/07/04 09:13:32 1.5
+++ httpd.h 1999/07/12 22:51:09 1.6
@@ -86,6 +86,9 @@
#elif defined(WIN32)
/* Set default for Windows file system */
#define HTTPD_ROOT /apache
+#elif defined (BEOS)
+/* Set the default for BeOS */
+#define HTTPD_ROOT /boot/home/apache
#else
#define HTTPD_ROOT /usr/local/apache
#endif
1.2 +6 -1 apache-2.0/mpm/src/main/util.c
Index: util.c
===
RCS file: /home/cvs/apache-2.0/mpm/src/main/util.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- util.c1999/06/18 18:39:30 1.1
+++ util.c1999/07/12 22:51:10 1.2
@@ -1962,7 +1962,12 @@
struct hostent *p;
/* ZZZ change to use AP funcs. */
-if (gethostname(str, sizeof(str) - 1) != 0) {
+#ifdef BEOS
+if (gethostname(str, sizeof(str) - 1) == 0)
+#else
+if (gethostname(str, sizeof(str) - 1) != 0)
+#endif
+{
perror(Unable to gethostname);
exit(1);
}
1.1 apache-2.0/mpm/src/os/beos/Makefile.tmpl
Index: Makefile.tmpl
===
CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
LIBS=$(EXTRA_LIBS) $(LIBS1)
INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
OBJS= os.o beosd.o iol_socket.o
LIB= libos.a
all: $(LIB)
$(LIB): $(OBJS)
rm -f $@
ar cr $@ $(OBJS)
$(RANLIB) $@
.c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $
clean:
rm -f $(OBJS) $(LIB)
distclean: clean
-rm -f Makefile
# We really don't expect end users to use this rule. It works only with
# gcc, and rebuilds Makefile.tmpl. You have to re-run Configure after
# using it.
depend:
cp Makefile.tmpl Makefile.tmpl.bak \
sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl Makefile.new \
gcc -MM $(INCLUDES) $(CFLAGS) *.c Makefile.new \
sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
-e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
Makefile.tmpl \
rm Makefile.new
$(OBJS): Makefile
# DO NOT REMOVE
1.1 apache-2.0/mpm/src/os/beos/beosd.c
Index: beosd.c
cvs commit: apache-2.0/mpm/src/main buff.c
dgaudet 99/06/30 21:07:22
Modified:mpm/src/main buff.c
Log:
uh that was an easy one to fix... I should know better than to post saying
I'll look at it later ;)
Revision ChangesPath
1.7 +1 -1 apache-2.0/mpm/src/main/buff.c
Index: buff.c
===
RCS file: /home/cvs/apache-2.0/mpm/src/main/buff.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- buff.c1999/06/24 08:58:00 1.6
+++ buff.c1999/07/01 04:07:19 1.7
@@ -554,7 +554,7 @@
i = 0;
total = 0;
while (i nvec) {
- rv = writev_with_errors(fb, vec, 2);
+ rv = writev_with_errors(fb, vec + i, nvec - i);
if (rv 0) {
return total ? -1 : total;
}
cvs commit: apache-2.0/mpm/src/os/unix iol_socket.c
dgaudet 99/06/28 12:00:50
Modified:mpm/src/include ap_iol.h
mpm/src/main iol_file.c
mpm/src/os/unix iol_socket.c
Log:
- eliminate readv -- it's mostly useful with a full zero-copy setup
- document the simple writev possible when system has no writev
Revision ChangesPath
1.4 +8 -4 apache-2.0/mpm/src/include/ap_iol.h
Index: ap_iol.h
===
RCS file: /home/cvs/apache-2.0/mpm/src/include/ap_iol.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ap_iol.h 1999/06/24 08:57:58 1.3
+++ ap_iol.h 1999/06/28 19:00:48 1.4
@@ -68,7 +68,7 @@
} ap_iol_option;
/*
-write, writev, read, readv guarantee they won't return EINTR.
+write, writev, read guarantee they won't return EINTR.
If no error occurs, they return the number of bytes read/written.
@@ -88,12 +88,18 @@
Just to drive the point home again -- none of these functions guarantee
they will read/write the entire length specified.
-Note: timeout == 0 is non-blocking operation... which requires a lot
+Note: timeout == 0 is non-blocking operation... which requires a lot
of care if you're implementing filters. It may mean you have to keep
state from one call to the next. The chunking filter will have an
example of this. If you're not sure how to handle the state sitatuation
you will want to return EINVAL when the timeout is set to 0. This may
break various things... hopefully we'll be able to recover gracefully.
+
+Note: implementation tip: if your system doesn't have writev(), you
+still have to implement a writev() method. However, since the
+iol writev() is allowed to return a partial write, you can essentially
+treat all writev()s as write(fd, vec[0].iov_base, vec[0].iov_len),
+and the layers above will loop over the entire vector for you.
*/
struct ap_iol_methods {
@@ -101,7 +107,6 @@
int (*write)(ap_iol *fd, const char *buf, int len);
int (*writev)(ap_iol *fd, const struct iovec *vec, int nvec);
int (*read)(ap_iol *fd, char *buf, int len);
-int (*readv)(ap_iol *fd, struct iovec *vec, int nvec);
int (*setopt)(ap_iol *fd, ap_iol_option opt, const void *value);
int (*getopt)(ap_iol *fd, ap_iol_option opt, void *value);
/* TODO: accept, connect, ... */
@@ -118,7 +123,6 @@
#define iol_write(iol, a, b) ((iol)-methods-write((iol), (a), (b)))
#define iol_writev(iol, a, b) ((iol)-methods-writev((iol), (a), (b)))
#define iol_read(iol, a, b) ((iol)-methods-read((iol), (a), (b)))
-#define iol_readv(iol, a, b) ((iol)-methods-readv((iol), (a), (b)))
#define iol_setopt(iol, a, b) ((iol)-methods-setopt((iol), (a), (b)))
#define iol_getopt(iol, a, b) ((iol)-methods-getopt((iol), (a), (b)))
1.2 +0 -2 apache-2.0/mpm/src/main/iol_file.c
Index: iol_file.c
===
RCS file: /home/cvs/apache-2.0/mpm/src/main/iol_file.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iol_file.c1999/06/24 08:58:00 1.1
+++ iol_file.c1999/06/28 19:00:49 1.2
@@ -81,7 +81,6 @@
method(write, (ap_iol *viol, const char *arg1, int arg2))
method(writev, (ap_iol *viol, const struct iovec *arg1, int arg2))
method(read, (ap_iol *viol, char *arg1, int arg2))
-method(readv, (ap_iol *viol, struct iovec *arg1, int arg2))
static int file_close(ap_iol *viol)
{
@@ -113,7 +112,6 @@
file_write,
file_writev,
file_read,
-file_readv,
file_setopt,
file_getopt
};
1.2 +0 -2 apache-2.0/mpm/src/os/unix/iol_socket.c
Index: iol_socket.c
===
RCS file: /home/cvs/apache-2.0/mpm/src/os/unix/iol_socket.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iol_socket.c 1999/06/24 08:58:04 1.1
+++ iol_socket.c 1999/06/28 19:00:50 1.2
@@ -185,7 +185,6 @@
method(write, (ap_iol *viol, const char *arg1, int arg2), write, NULL,
fdset)
method(writev, (ap_iol *viol, const struct iovec *arg1, int arg2), writev,
NULL, fdset)
method(read, (ap_iol *viol, char *arg1, int arg2), read, fdset, NULL)
-method(readv, (ap_iol *viol, struct iovec *arg1, int arg2), readv, fdset,
NULL)
static int unix_close(ap_iol *viol)
{
@@ -205,7 +204,6 @@
unix_write,
unix_writev,
unix_read,
-unix_readv,
unix_setopt,
unix_getopt
};
cvs commit: apache-2.0/mpm/src/main http_protocol.c
dgaudet 99/06/24 18:17:01
Modified:mpm/src/main http_protocol.c
Log:
random futzing around
Revision ChangesPath
1.7 +9 -9 apache-2.0/mpm/src/main/http_protocol.c
Index: http_protocol.c
===
RCS file: /home/cvs/apache-2.0/mpm/src/main/http_protocol.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- http_protocol.c 1999/06/24 07:29:31 1.6
+++ http_protocol.c 1999/06/25 01:16:57 1.7
@@ -1364,15 +1364,15 @@
* It is more expensive to check the User-Agent than it is to just add the
* bytes, so we haven't used the BrowserMatch feature here.
*/
-static void terminate_header(BUFF *client)
+static void terminate_header(request_rec *r)
{
long int bs;
-ap_bgetopt(client, BO_BYTECT, bs);
+ap_bgetopt(r-connection-client, BO_BYTECT, bs);
if (bs = 255 bs = 257)
-ap_bputs(X-Pad: avoid browser bug\015\012, client);
+ap_rputs(X-Pad: avoid browser bug\015\012, r);
-ap_bputs(\015\012, client); /* Send the terminating empty line */
+ap_rputs(\015\012, r); /* Send the terminating empty line */
}
/* Build the Allow field-value from the request handler method mask.
@@ -1440,7 +1440,7 @@
ap_table_do((int (*) (void *, const char *, const char *))
ap_send_header_field,
(void *) r, r-headers_out, NULL);
-terminate_header(r-connection-client);
+terminate_header(r);
ap_bsetopt(r-connection-client, BO_BYTECT, zero);
@@ -1544,7 +1544,7 @@
ap_table_do((int (*) (void *, const char *, const char *))
ap_send_header_field,
(void *) r, r-headers_out, NULL);
-terminate_header(r-connection-client);
+terminate_header(r);
ap_bsetopt(r-connection-client, BO_BYTECT, zero);
@@ -2186,7 +2186,7 @@
int n;
if (r-connection-aborted)
-return -1;
+return EOF;
n = ap_bwrite(r-connection-client, buf, nbyte);
if (n 0) {
@@ -2196,7 +2196,7 @@
ap_bsetflag(r-connection-client, B_EOUT, 1);
r-connection-aborted = 1;
}
-return -1;
+return EOF;
}
SET_BYTES_SENT(r);
return n;
@@ -2344,7 +2344,7 @@
Proxy-Authenticate,
NULL);
-terminate_header(r-connection-client);
+terminate_header(r);
return;
}
cvs commit: apache-2.0/mpm/src/modules/mpm/prefork Makefile.tmpl prefork.c
dgaudet 99/06/24 18:25:12
Modified:mpm/src/include httpd.h
mpm/src/main Makefile.tmpl http_config.c http_core.c
mpm/src/modules/mpm/prefork Makefile.tmpl prefork.c
Added: mpm/src/include ap_listen.h
mpm/src/main listen.c
Log:
- ap_listen.h: interface to Listen, ListenBackLog and SendBufferSize
directives
- I didn't update mpmt_pthread with this change, it shouldn't be hard to fix.
- maybe this isn't the best way to abstract listen... but it gets a little
bit of the job done
Revision ChangesPath
1.3 +0 -11 apache-2.0/mpm/src/include/httpd.h
Index: httpd.h
===
RCS file: /home/cvs/apache-2.0/mpm/src/include/httpd.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- httpd.h 1999/06/20 11:19:45 1.2
+++ httpd.h 1999/06/25 01:25:06 1.3
@@ -666,7 +666,6 @@
typedef struct conn_rec conn_rec;
typedef struct server_rec server_rec;
typedef struct request_rec request_rec;
-typedef struct listen_rec listen_rec;
#include util_uri.h
@@ -921,7 +920,6 @@
int keep_alive_timeout; /* Seconds we'll wait for another request */
int keep_alive_max; /* Maximum requests per connection */
int keep_alive; /* Use persistent connections? */
-int send_buffer_size;/* size of TCP send buffer (in bytes) */
char *path; /* Pathname for ServerPath */
int pathlen; /* Length of path */
@@ -937,15 +935,6 @@
int limit_req_fields;/* limit on number of request header fields */
};
-/* These are more like real hosts than virtual hosts */
-struct listen_rec {
-listen_rec *next;
-struct sockaddr_in local_addr; /* local IP address and port */
-int fd;
-int used; /* Only used during restart */
-int index;/* index into the listenfds array */
-/* more stuff here, like which protocol is bound to the port */
-};
/* Prototypes for utilities... util.c.
*/
1.1 apache-2.0/mpm/src/include/ap_listen.h
Index: ap_listen.h
===
/*
* Copyright (c) 1996-1999 The Apache Group. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. All advertising materials mentioning features or use of this
*software must display the following acknowledgment:
*This product includes software developed by the Apache Group
*for use in the Apache HTTP server project (http://www.apache.org/).
*
* 4. The names Apache Server and Apache Group must not be used to
*endorse or promote products derived from this software without
*prior written permission. For written permission, please contact
*[EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called Apache
*nor may Apache appear in their names without prior written
*permission of the Apache Group.
*
* 6. Redistributions of any form whatsoever must retain the following
*acknowledgment:
*This product includes software developed by the Apache Group
*for use in the Apache HTTP server project (http://www.apache.org/).
*
* THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Group
cvs commit: apache-2.0/mpm/src/modules/mpm/prefork prefork.c
dgaudet 99/06/24 00:29:33 Modified:mpm/src/include buff.h mpm/src/main buff.c http_protocol.c iol_unix.c mpm/src/modules/mpm/prefork prefork.c Log: new-fangled BUFF... this could easily be broken, but hey, the one that was in here before was broken in different ways... I've served up a few pages with this one. Revision ChangesPath 1.4 +38 -6 apache-2.0/mpm/src/include/buff.h Index: buff.h === RCS file: /home/cvs/apache-2.0/mpm/src/include/buff.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- buff.h1999/06/18 23:34:58 1.3 +++ buff.h1999/06/24 07:29:29 1.4 @@ -65,6 +65,37 @@ #include stdarg.h #include ap_iol.h +/* +A BUFF is an i/o object which can be used in any of the following +output modes: + +blocking, buffered +blocking, buffered, HTTP-chunked +blocking, unbuffered +blocking, unbuffered, HTTP-chunked +non-blocking, unbuffered +non-blocking, unbuffered, HTTP-chunked + +In all the blocking modes, a bwrite(fb, buf, len) will return less +than len only in an error state. The error may be deferred until +the next use of fb. + +In the non-blocking, chunked mode, the caller of bwrite() makes a +guarantee that if a partial write occurs, they will call back later +with at least as many bytes to write -- prior to disabling chunking. +This is a protocol correctness requirement -- the chunk length may +already have hit the wire, and is in essence committed. + +bputc, bputs, bvputs, and bprintf are supported only in the buffered +modes. + +The following input modes are supported: + +blocking, buffered +blocking, unbuffered +non-blocking, unbuffered +*/ + /* Reading is buffered */ #define B_RD (1) /* Writing is buffered */ @@ -82,16 +113,12 @@ #undef B_ERROR #endif #define B_ERROR (48) -/* TODO: implement chunked encoding as a layer */ +/* Use chunked writing */ +#define B_CHUNK (64) /* bflush() if a read would block */ /* TODO: #define B_SAFEREAD (128) */ -/* buffer is a socket */ -#define B_SOCKET (256) - /* caller expects non-blocking behaviour */ #define B_NONBLOCK (512) -/* non-blocking bit set on fd */ -#define B_NONBLOCK_SET (1024) /* TODO: implement a ebcdic/ascii conversion layers */ @@ -103,10 +130,15 @@ unsigned char *inptr;/* pointer to next location to read */ int incnt; /* number of bytes left to read from input buffer; * always 0 if had a read error */ +int outchunk; /* location of chunk header when chunking */ int outcnt; /* number of byte put in output buffer */ unsigned char *inbase; unsigned char *outbase; int bufsiz; +int chunk_overcommit;/* when we start a chunk and get a partial write we + * keep track of the #remaining bytes in the chunk + * here + */ void (*error) (BUFF *fb, int op, void *data); void *error_data; long int bytes_sent; /* number of bytes actually written */ 1.5 +266 -143 apache-2.0/mpm/src/main/buff.c Index: buff.c === RCS file: /home/cvs/apache-2.0/mpm/src/main/buff.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- buff.c1999/06/20 12:25:54 1.4 +++ buff.c1999/06/24 07:29:31 1.5 @@ -76,6 +76,17 @@ #define DEFAULT_BUFSIZE (4096) #endif +/* the maximum size of any chunk */ +#ifndef MAX_CHUNK_SIZE +#define MAX_CHUNK_SIZE (0x8000) +#endif + +/* This must be enough to represent MAX_CHUNK_SIZE in hex, + * plus two extra characters. + */ +#ifndef CHUNK_HEADER_SIZE +#define CHUNK_HEADER_SIZE (6) +#endif /* bwrite()s of greater than this size can result in a large_write() call, * which can result in a writev(). It's a little more work to set up the @@ -88,7 +99,6 @@ #define LARGE_WRITE_THRESHOLD 31 #endif - /* * Buffered I/O routines. * These are a replacement for the stdio routines. @@ -136,15 +146,18 @@ fb = ap_palloc(p, sizeof(BUFF)); fb-pool = p; fb-bufsiz = DEFAULT_BUFSIZE; -fb-flags = flags (B_RDWR | B_SOCKET); +fb-flags = flags B_RDWR; if (flags B_RD) fb-inbase = ap_palloc(p, fb-bufsiz); else fb-inbase = NULL; +/* overallocate so that we can put a chunk trailer of CRLF into this + * buffer... and possibly the beginning of a new chunk + */ if (flags B_WR) - fb-outbase
cvs commit: apache-2.0/mpm/src/modules/mpm/prefork .cvsignore
dgaudet 99/06/24 00:29:59 Added: mpm/src/modules/mpm/prefork .cvsignore Log: ignore Makefile Revision ChangesPath 1.1 apache-2.0/mpm/src/modules/mpm/prefork/.cvsignore Index: .cvsignore === Makefile
cvs commit: apache-2.0/mpm/src/os/unix iol_socket.c iol_socket.h Makefile.tmpl
dgaudet 99/06/24 01:58:06
Modified:mpm/src/include ap_iol.h buff.h
mpm/src/main Makefile.tmpl alloc.c buff.c
mpm/src/modules/mpm/prefork prefork.c
mpm/src/os/unix Makefile.tmpl
Added: mpm/src/main iol_file.c
mpm/src/os/unix iol_socket.c iol_socket.h
Removed: mpm/src/main iol_unix.c
Log:
I think this is a better i/o layer interface.
- move main/iol_unix.c to os/unix/iol_socket.c
- create main/iol_file.c ... use APR methods eventually
- remove iol_data from ap_iol, instead the ap_iol is just embedded into
the private data of the i/o layer
- remove ap_bpushfd(), replace with ap_bpush_iol()
Revision ChangesPath
1.3 +6 -4 apache-2.0/mpm/src/include/ap_iol.h
Index: ap_iol.h
===
RCS file: /home/cvs/apache-2.0/mpm/src/include/ap_iol.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ap_iol.h 1999/06/19 20:40:16 1.2
+++ ap_iol.h 1999/06/24 08:57:58 1.3
@@ -107,8 +107,10 @@
/* TODO: accept, connect, ... */
};
+/* it is expected that each io layer will extend this structure as they
+require; they must only ensure that the methods pointer remains in
+the indicated position. */
struct ap_iol {
-void *iol_data;
const ap_iol_methods *methods;
};
@@ -120,8 +122,8 @@
#define iol_setopt(iol, a, b) ((iol)-methods-setopt((iol), (a), (b)))
#define iol_getopt(iol, a, b) ((iol)-methods-getopt((iol), (a), (b)))
-/* clean this up later as well */
-
-void unix_attach_fd(ap_iol *, int fd);
+/* the file iol */
+/* TODO: use APR instead of unix semantics for this */
+ap_iol *ap_open_file(const char *name, int flags, int mask);
#endif
1.5 +3 -2 apache-2.0/mpm/src/include/buff.h
Index: buff.h
===
RCS file: /home/cvs/apache-2.0/mpm/src/include/buff.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- buff.h1999/06/24 07:29:29 1.4
+++ buff.h1999/06/24 08:57:58 1.5
@@ -145,7 +145,7 @@
ap_pool *pool;
-ap_iol iol;
+ap_iol *iol;
};
/* Options to bset/getopt */
@@ -155,7 +155,8 @@
/* Stream creation and modification */
API_EXPORT(BUFF *) ap_bcreate(pool *p, int flags);
-API_EXPORT(void) ap_bpushfd(BUFF *fb, int fd);
+
+API_EXPORT(void) ap_bpush_iol(BUFF *fb, ap_iol *iol);
/* XXX - unused right now - mvsk */
API_EXPORT(BUFF *) ap_bopenf(pool *a, const char *name, int flg, int mode);
1.6 +1 -1 apache-2.0/mpm/src/main/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /home/cvs/apache-2.0/mpm/src/main/Makefile.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.tmpl 1999/06/20 23:49:32 1.5
+++ Makefile.tmpl 1999/06/24 08:58:00 1.6
@@ -11,7 +11,7 @@
http_config.o http_core.o http_log.o \
http_main.o http_protocol.o http_request.o http_vhost.o \
util.o util_date.o util_script.o util_uri.o util_md5.o \
- rfc1413.o http_connection.o iol_unix.o
+ rfc1413.o http_connection.o iol_file.o
.c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $
1.5 +4 -0 apache-2.0/mpm/src/main/alloc.c
Index: alloc.c
===
RCS file: /home/cvs/apache-2.0/mpm/src/main/alloc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- alloc.c 1999/06/22 22:26:10 1.4
+++ alloc.c 1999/06/24 08:58:00 1.5
@@ -2370,6 +2370,9 @@
enum kill_conditions kill_how,
BUFF **pipe_in, BUFF **pipe_out, BUFF
**pipe_err)
{
+return 0;
+/* TODO: need to abstract the spawning stuff in a more clean manner */
+#if 0
#ifdef WIN32
SECURITY_ATTRIBUTES sa = {0};
HANDLE hPipeOutputRead = NULL;
@@ -2588,6 +2591,7 @@
#endif
return pid;
+#endif
}
static void free_proc_chain(struct process_chain *procs)
1.6 +13 -14apache-2.0/mpm/src/main/buff.c
Index: buff.c
===
RCS file: /home/cvs/apache-2.0/mpm/src/main/buff.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- buff.c1999/06/24 07:29:31 1.5
+++ buff.c1999/06/24 08:58:00 1.6
@@ -177,17 +177,16 @@
{
BUFF *fb = v;
-iol_close(fb-iol);
+iol_close(fb-iol);
}
/*
* Push some I/O file descriptors onto the stream
*/
-API_EXPORT(void) ap_bpushfd(BUFF *fb, APRFile fd)
+API_EXPORT(void) ap_bpush_iol
cvs commit: apache-2.0/mpm/src/os/unix Makefile.tmpl
dgaudet 99/06/24 01:59:00 Modified:mpm/src/main Makefile.tmpl mpm/src/modules/mpm/prefork Makefile.tmpl mpm/src/os/unix Makefile.tmpl Log: depends Revision ChangesPath 1.7 +1 -1 apache-2.0/mpm/src/main/Makefile.tmpl Index: Makefile.tmpl === RCS file: /home/cvs/apache-2.0/mpm/src/main/Makefile.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile.tmpl 1999/06/24 08:58:00 1.6 +++ Makefile.tmpl 1999/06/24 08:58:56 1.7 @@ -143,7 +143,7 @@ $(INCDIR)/http_config.h $(INCDIR)/http_log.h \ $(INCDIR)/http_vhost.h $(INCDIR)/http_protocol.h \ $(INCDIR)/http_core.h -iol_unix.o: iol_unix.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ +iol_file.o: iol_file.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \ 1.2 +10 -7 apache-2.0/mpm/src/modules/mpm/prefork/Makefile.tmpl Index: Makefile.tmpl === RCS file: /home/cvs/apache-2.0/mpm/src/modules/mpm/prefork/Makefile.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.tmpl 1999/06/24 01:57:58 1.1 +++ Makefile.tmpl 1999/06/24 08:58:58 1.2 @@ -55,12 +55,15 @@ $(OBJS) $(OBJS_PIC): Makefile # DO NOT REMOVE -prefork.o: prefork.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ - $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ - $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \ - $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \ - $(INCDIR)/http_main.h $(INCDIR)/http_log.h $(INCDIR)/http_config.h \ +prefork.o: prefork.c $(INCDIR)/httpd.h \ + $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ + $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ + $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ + $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \ + $(INCDIR)/ap.h $(INCDIR)/apr.h \ + $(INCDIR)/util_uri.h $(INCDIR)/http_main.h \ + $(INCDIR)/http_log.h $(INCDIR)/http_config.h \ $(INCDIR)/http_core.h $(INCDIR)/http_connection.h \ $(INCDIR)/scoreboard_prefork.h $(INCDIR)/ap_mpm.h \ - $(OSDIR)/unixd.h + $(OSDIR)/unixd.h $(OSDIR)/iol_socket.h 1.6 +7 -0 apache-2.0/mpm/src/os/unix/Makefile.tmpl Index: Makefile.tmpl === RCS file: /home/cvs/apache-2.0/mpm/src/os/unix/Makefile.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile.tmpl 1999/06/24 08:58:04 1.5 +++ Makefile.tmpl 1999/06/24 08:58:59 1.6 @@ -38,6 +38,13 @@ $(OBJS): Makefile # DO NOT REMOVE +iol_socket.o: iol_socket.c $(INCDIR)/httpd.h \ + $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ + $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ + $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \ + $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \ + $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \ + $(INCDIR)/util_uri.h os-aix-dso.o: os-aix-dso.c os-inline.o: os-inline.c $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
cvs commit: apache-2.0/mpm/src/main http_connection.c mpm_prefork.c
dgaudet 99/06/20 16:09:54
Modified:mpm/src/include ap_mpm.h
mpm/src/main http_connection.c mpm_prefork.c
Log:
ap_mpm_graceful_stop - ap_graceful_stop_signalled
Revision ChangesPath
1.4 +1 -1 apache-2.0/mpm/src/include/ap_mpm.h
Index: ap_mpm.h
===
RCS file: /home/cvs/apache-2.0/mpm/src/include/ap_mpm.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ap_mpm.h 1999/06/20 22:05:13 1.3
+++ ap_mpm.h 1999/06/20 23:09:51 1.4
@@ -112,7 +112,7 @@
/* predicate indicating if a graceful stop has been requested ...
used by the connection loop */
-API_EXPORT(int) ap_mpm_graceful_stop(void);
+API_EXPORT(int) ap_graceful_stop_signalled(void);
/* a mutex which synchronizes threads within one process */
typedef struct ap_thread_mutex ap_thread_mutex;
1.4 +1 -1 apache-2.0/mpm/src/main/http_connection.c
Index: http_connection.c
===
RCS file: /home/cvs/apache-2.0/mpm/src/main/http_connection.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- http_connection.c 1999/06/19 20:23:37 1.3
+++ http_connection.c 1999/06/20 23:09:53 1.4
@@ -206,7 +206,7 @@
ap_destroy_pool(r-pool);
- if (ap_mpm_graceful_stop()) {
+ if (ap_graceful_stop_signalled()) {
/* XXX: hey wait, this should do a lingering_close! */
ap_bclose(c-client);
return;
1.7 +3 -3 apache-2.0/mpm/src/main/mpm_prefork.c
Index: mpm_prefork.c
===
RCS file: /home/cvs/apache-2.0/mpm/src/main/mpm_prefork.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mpm_prefork.c 1999/06/20 22:59:51 1.6
+++ mpm_prefork.c 1999/06/20 23:09:53 1.7
@@ -2377,7 +2377,7 @@
requests_this_child = ap_max_requests_per_child = 1;
}
-int ap_mpm_graceful_stop(void)
+int ap_graceful_stop_signalled(void)
{
ap_sync_scoreboard_image();
if (deferred_die ||
@@ -2431,7 +2431,7 @@
}
#endif
-while (!ap_mpm_graceful_stop()) {
+while (!ap_graceful_stop_signalled()) {
BUFF *conn_io;
/* Prepare to receive a SIGUSR1 due to graceful restart so that
@@ -2581,7 +2581,7 @@
}
}
- if (ap_mpm_graceful_stop()) {
+ if (ap_graceful_stop_signalled()) {
clean_child_exit(0);
}
usr1_just_die = 1;
cvs commit: apache-2.0/mpm/src Configure
dgaudet 99/06/20 16:14:18 Modified:mpm/src Configure Log: disable this while jim is working... no mpm/Makefile.tmpl yet Revision ChangesPath 1.5 +2 -1 apache-2.0/mpm/src/Configure Index: Configure === RCS file: /home/cvs/apache-2.0/mpm/src/Configure,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Configure 1999/06/20 22:25:24 1.4 +++ Configure 1999/06/20 23:14:17 1.5 @@ -1594,7 +1594,8 @@ ## Choose the right MPM method ## TODO:: More later -SUBDIRS=mpm/$RULE_MPM_METHOD $SUBDIRS +#SUBDIRS=mpm/$RULE_MPM_METHOD $SUBDIRS +SUBDIRS=$SUBDIRS ## Add in the Expat library if needed/wanted.
cvs commit: apache-2.0/mpm/src/os/unix Makefile.tmpl
dgaudet 99/06/20 16:14:36 Modified:mpm/src Makefile.tmpl mpm/src/ap Makefile.tmpl mpm/src/main Makefile.tmpl mpm/src/modules/standard Makefile.tmpl mpm/src/os/unix Makefile.tmpl Log: depends Revision ChangesPath 1.3 +4 -3 apache-2.0/mpm/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /home/cvs/apache-2.0/mpm/src/Makefile.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile.tmpl 1999/06/18 19:07:59 1.2 +++ Makefile.tmpl 1999/06/20 23:14:29 1.3 @@ -124,9 +124,10 @@ buildmark.o: buildmark.c include/ap_config.h include/ap_mmn.h \ include/ap_config_auto.h os/unix/os.h os/unix/os-inline.c \ include/ap_ctype.h include/hsregex.h include/httpd.h include/alloc.h \ - include/buff.h include/ap.h include/apr.h include/util_uri.h + include/buff.h include/ap_iol.h include/ap.h include/apr.h \ + include/util_uri.h modules.o: modules.c include/httpd.h include/ap_config.h \ include/ap_mmn.h include/ap_config_auto.h os/unix/os.h \ os/unix/os-inline.c include/ap_ctype.h include/hsregex.h \ - include/alloc.h include/buff.h include/ap.h include/apr.h \ - include/util_uri.h include/http_config.h + include/alloc.h include/buff.h include/ap_iol.h include/ap.h \ + include/apr.h include/util_uri.h include/http_config.h 1.4 +14 -10apache-2.0/mpm/src/ap/Makefile.tmpl Index: Makefile.tmpl === RCS file: /home/cvs/apache-2.0/mpm/src/ap/Makefile.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile.tmpl 1999/06/19 20:41:59 1.3 +++ Makefile.tmpl 1999/06/20 23:14:30 1.4 @@ -39,16 +39,19 @@ rm Makefile.new # DO NOT REMOVE +ap_buf.o: ap_buf.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ + $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \ + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap_buf.h ap_cpystrn.o: ap_cpystrn.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/apr.h \ - $(INCDIR)/util_uri.h + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \ + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h ap_execve.o: ap_execve.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/apr.h \ - $(INCDIR)/util_uri.h + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \ + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h ap_fnmatch.o: ap_fnmatch.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \ $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/fnmatch.h @@ -63,15 +66,16 @@ ap_signal.o: ap_signal.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/apr.h \ - $(INCDIR)/util_uri.h + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \ + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h ap_slack.o: ap_slack.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/apr.h \ - $(INCDIR)/util_uri.h $(INCDIR)/http_log.h + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \ + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_log.h ap_snprintf.o: ap_snprintf.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/apr.h \ - $(INCDIR)/util_uri.h + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \ + $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h 1.4 +64 -48apache-2.0/mpm/src/main/Makefile.tmpl Index: Makefile.tmpl === RCS file: /home/cvs/apache-2.0/mpm/src/main/Makefile.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile.tmpl 1999/06/18 23:34:59 1.3 +++ Makefile.tmpl 1999/06/20 23:14:31 1.4 @@ -61,40 +61,44 @@ alloc.o: alloc.c $(INCDIR)/httpd.h
cvs commit: apache-2.0/mpm/src/ap ap_buf.c
dgaudet 99/06/20 12:34:29
Modified:mpm/src/include ap_buf.h
mpm/src/ap ap_buf.c
Log:
some other stuff left over from hacking zero-copy
Revision ChangesPath
1.2 +4 -0 apache-2.0/mpm/src/include/ap_buf.h
Index: ap_buf.h
===
RCS file: /home/cvs/apache-2.0/mpm/src/include/ap_buf.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ap_buf.h 1999/06/19 20:42:01 1.1
+++ ap_buf.h 1999/06/20 19:34:28 1.2
@@ -73,6 +73,7 @@
struct ap_buf {
ap_bufel *head;
ap_bufel **tail;
+unsigned size;
};
/* allocate a bufel */
@@ -93,5 +94,8 @@
/* create an iovec of the elements in buf... return number of elements used
*/
API_EXPORT(int) ap_buf_to_iovec(ap_buf *, struct iovec *vec, int nvec);
+
+/* catenate buf b onto buf a, buf b is empty after this */
+API_EXPORT(void) ap_buf_catenate(ap_buf *a, ap_buf *b);
#endif
1.2 +15 -0 apache-2.0/mpm/src/ap/ap_buf.c
Index: ap_buf.c
===
RCS file: /home/cvs/apache-2.0/mpm/src/ap/ap_buf.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ap_buf.c 1999/06/19 20:42:00 1.1
+++ ap_buf.c 1999/06/20 19:34:29 1.2
@@ -76,12 +76,14 @@
{
b-head = NULL;
b-tail = b-head;
+b-size = 0;
}
API_EXPORT(void) ap_buf_append(ap_buf *b, ap_bufel *e)
{
e-next = *b-tail;
b-tail = e-next;
+b-size += e-end - e-start;
}
API_EXPORT(void) ap_buf_consume(ap_buf *b, int nbytes)
@@ -90,6 +92,7 @@
ap_bufel *n;
int amt;
+b-size -= nbytes;
e = b-head;
while (e nbytes) {
amt = e-end - e-start;
@@ -123,4 +126,16 @@
++vec;
}
return vec - orig;
+}
+
+API_EXPORT(void) ap_buf_catenate(ap_buf *a, ap_buf *b)
+{
+if (b-head) {
+ *a-tail = b-head;
+ a-tail = b-tail;
+ b-head = NULL;
+ b-tail = b-head;
+ a-size += b-size;
+ b-size = 0;
+}
}
cvs commit: apache-2.0/mpm/src/main alloc.c http_config.c mpm_prefork.c
dgaudet 99/06/20 14:12:51
Modified:mpm/src CHANGES Configuration.mpm Configure
mpm/src/include ap_mpm.h
mpm/src/main alloc.c http_config.c mpm_prefork.c
Log:
crude ap_thread_mutex abstraction
Revision ChangesPath
1.6 +3 -0 apache-2.0/mpm/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-2.0/mpm/src/CHANGES,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CHANGES 1999/06/20 12:29:18 1.5
+++ CHANGES 1999/06/20 21:12:47 1.6
@@ -1,5 +1,8 @@
Changes with MPM
+* Crude ap_thread_mutex abstraction so that we get the pthread stuff out
+ of alloc.c for now. [Dean Gaudet]
+
* Handle partial large writes correctly.
[Ben Laurie]
1.7 +1 -1 apache-2.0/mpm/src/Configuration.mpm
Index: Configuration.mpm
===
RCS file: /home/cvs/apache-2.0/mpm/src/Configuration.mpm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Configuration.mpm 1999/06/20 15:59:56 1.6
+++ Configuration.mpm 1999/06/20 21:12:47 1.7
@@ -1,4 +1,4 @@
-EXTRA_CFLAGS= -Wall #-pthread -D_THREAD_SAFE # Uncomment for FreeBSD
+EXTRA_CFLAGS= -Wall
EXTRA_LDFLAGS=
EXTRA_LIBS=
EXTRA_INCLUDES=
1.3 +1 -1 apache-2.0/mpm/src/Configure
Index: Configure
===
RCS file: /home/cvs/apache-2.0/mpm/src/Configure,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Configure 1999/06/18 19:20:18 1.2
+++ Configure 1999/06/20 21:12:48 1.3
@@ -426,7 +426,7 @@
*-linux2)
DEF_WANTHSREGEX=yes
OS='Linux'
- CFLAGS=$CFLAGS -DLINUX=2 -pthread
+ CFLAGS=$CFLAGS -DLINUX=2
LIBS=$LIBS -lm
;;
*-linux1)
1.2 +7 -0 apache-2.0/mpm/src/include/ap_mpm.h
Index: ap_mpm.h
===
RCS file: /home/cvs/apache-2.0/mpm/src/include/ap_mpm.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ap_mpm.h 1999/06/18 18:39:29 1.1
+++ ap_mpm.h 1999/06/20 21:12:49 1.2
@@ -66,6 +66,13 @@
used by the connection loop */
API_EXPORT(int) ap_mpm_graceful_stop(void);
+/* a mutex which synchronizes threads within one process */
+typedef struct ap_thread_mutex ap_thread_mutex;
+API_EXPORT(ap_thread_mutex *) ap_thread_mutex_new(void);
+API_EXPORT(void) ap_thread_mutex_lock(ap_thread_mutex *);
+API_EXPORT(void) ap_thread_mutex_unlock(ap_thread_mutex *);
+API_EXPORT(void) ap_thread_mutex_destroy(ap_thread_mutex *);
+
#ifdef HAS_OTHER_CHILD
/*
* register an other_child -- a child which the main loop keeps track of
1.2 +19 -14apache-2.0/mpm/src/main/alloc.c
Index: alloc.c
===
RCS file: /home/cvs/apache-2.0/mpm/src/main/alloc.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alloc.c 1999/06/18 18:39:29 1.1
+++ alloc.c 1999/06/20 21:12:49 1.2
@@ -64,9 +64,9 @@
#include httpd.h
#include http_log.h
+#include ap_mpm.h
#include stdarg.h
-#include pthread.h
#ifdef OS2
#define INCL_DOS
@@ -209,7 +209,7 @@
static union block_hdr *block_freelist = NULL;
-static pthread_mutex_t alloc_mutex = PTHREAD_MUTEX_INITIALIZER;
+static ap_thread_mutex *alloc_mutex;
#ifdef POOL_DEBUG
static char *known_stack_point;
static int stack_direction;
@@ -343,7 +343,7 @@
if (blok == NULL)
return; /* Sanity check --- freeing empty pool? */
-(void) pthread_mutex_lock(alloc_mutex);
+(void) ap_thread_mutex_lock(alloc_mutex);
old_free_list = block_freelist;
block_freelist = blok;
@@ -377,7 +377,7 @@
num_blocks_freed += num_blocks;
#endif
-(void) pthread_mutex_unlock(alloc_mutex);
+(void) ap_thread_mutex_unlock(alloc_mutex);
#endif
}
@@ -426,9 +426,9 @@
{
union block_hdr *blok;
-(void) pthread_mutex_lock(alloc_mutex);
+(void) ap_thread_mutex_lock(alloc_mutex);
blok = new_block(min_size);
-(void) pthread_mutex_unlock(alloc_mutex);
+(void) ap_thread_mutex_unlock(alloc_mutex);
return blok;
}
@@ -473,7 +473,7 @@
union block_hdr *blok;
root_pool *new_pool;
-(void) pthread_mutex_lock(alloc_mutex);
+(void) ap_thread_mutex_lock(alloc_mutex);
blok = new_block(ROOT_HDR_BYTES);
new_pool = (root_pool *) blok-h.first_avail;
@@ -487,7 +487,7 @@
new_pool-p.first = new_pool-p.last = blok;
new_pool-p.thread_root
cvs commit: apache-2.0/mpm/src/main alloc.c mpm_prefork.c
dgaudet 99/06/20 14:46:14
Modified:mpm/src CHANGES
mpm/src/include alloc.h
mpm/src/main alloc.c mpm_prefork.c
Log:
remove 1.3 timeout code; SIGUSR1/SIGHUP/SIGTERM working again
Revision ChangesPath
1.7 +3 -0 apache-2.0/mpm/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-2.0/mpm/src/CHANGES,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CHANGES 1999/06/20 21:12:47 1.6
+++ CHANGES 1999/06/20 21:46:11 1.7
@@ -1,5 +1,8 @@
Changes with MPM
+* mpm_prefork: throw away all the alarm/timeout crud; and clean up the
+ signal handling for the new world order. [Dean Gaudet]
+
* Crude ap_thread_mutex abstraction so that we get the pthread stuff out
of alloc.c for now. [Dean Gaudet]
1.2 +0 -22 apache-2.0/mpm/src/include/alloc.h
Index: alloc.h
===
RCS file: /home/cvs/apache-2.0/mpm/src/include/alloc.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alloc.h 1999/06/18 18:39:27 1.1
+++ alloc.h 1999/06/20 21:46:12 1.2
@@ -287,10 +287,6 @@
*
* Cleanups are identified for purposes of finding running them off by the
* plain_cleanup and data, which should presumably be unique.
- *
- * NB any code which invokes register_cleanup or kill_cleanup directly
- * is a critical section which should be guarded by block_alarms() and
- * unblock_alarms() below...
*/
API_EXPORT(void) ap_register_cleanup(pool *p, void *data,
@@ -303,24 +299,6 @@
/* A do-nothing cleanup, for register_cleanup; it's faster to do
* things this way than to test for NULL. */
API_EXPORT_NONSTD(void) ap_null_cleanup(void *data);
-
-/* The time between when a resource is actually allocated, and when it
- * its cleanup is registered is a critical section, during which the
- * resource could leak if we got interrupted or timed out. So, anything
- * which registers cleanups should bracket resource allocation and the
- * cleanup registry with these. (This is done internally by run_cleanup).
- *
- * NB they are actually implemented in http_main.c, since they are bound
- * up with timeout handling in general...
- */
-
-#ifdef TPF
-#define ap_block_alarms() (0)
-#define ap_unblock_alarms() (0)
-#else
-API_EXPORT(void) ap_block_alarms(void);
-API_EXPORT(void) ap_unblock_alarms(void);
-#endif /* TPF */
/* Common cases which want utility support..
* the note_cleanups_for_foo routines are for
1.3 +4 -4 apache-2.0/mpm/src/main/alloc.c
Index: alloc.c
===
RCS file: /home/cvs/apache-2.0/mpm/src/main/alloc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alloc.c 1999/06/20 21:12:49 1.2
+++ alloc.c 1999/06/20 21:46:12 1.3
@@ -303,7 +303,7 @@
#define test_is_free(_x)
#endif
-/* Free a chain of blocks --- must be called with alarms blocked. */
+/* Free a chain of blocks --- must be called with mutex held. */
#ifdef POOL_DEBUG
#define reset_block(b) do { \
test_is_free(b); \
@@ -383,7 +383,7 @@
/* Get a new block, from our own free list if possible, from the system
- * if necessary. Must be called with alarms blocked.
+ * if necessary. Must be called with mutex held.
*/
static union block_hdr *new_block(int min_size)
@@ -873,8 +873,8 @@
* until all the output is done.
*
* Note that this is completely safe because nothing else can
- * allocate in this pool while ap_psprintf is running. alarms are
- * blocked, and the only thing outside of alloc.c that's invoked
+ * allocate in this pool while ap_psprintf is running.
+ * The only thing outside of alloc.c that's invoked
* is ap_vformatter -- which was purposefully written to be
* self-contained with no callouts.
*/
1.5 +21 -348 apache-2.0/mpm/src/main/mpm_prefork.c
Index: mpm_prefork.c
===
RCS file: /home/cvs/apache-2.0/mpm/src/main/mpm_prefork.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mpm_prefork.c 1999/06/20 21:12:50 1.4
+++ mpm_prefork.c 1999/06/20 21:46:13 1.5
@@ -82,7 +82,6 @@
* TODO: behave like apache-1.3... here's a short list of things I think
* TODO: need cleaning up still:
* TODO: - use ralf's mm stuff for the shared mem and mutexes
- * TODO: - eliminate the timeout stuff... 2.0 timeouts are part of the BUFF
* TODO: - abstract the Listen stuff, it's going to be common with other MPM
* TODO: - clean up scoreboard stuff when we figure out how
cvs commit: apache-2.0/mpm/src/os/unix unixd.c unixd.h Makefile.tmpl
dgaudet 99/06/20 15:59:53 Modified:mpm/src CHANGES mpm/src/include http_config.h mpm/src/main mpm_prefork.c mpm/src/os/unix Makefile.tmpl Added: mpm/src/os/unix unixd.c unixd.h Log: detach, set_group_privs, and such... these will be common amongst the unix MPMs, so split them off into os/unix/unixd.[ch]. Revision ChangesPath 1.8 +3 -0 apache-2.0/mpm/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-2.0/mpm/src/CHANGES,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- CHANGES 1999/06/20 21:46:11 1.7 +++ CHANGES 1999/06/20 22:59:49 1.8 @@ -1,5 +1,8 @@ Changes with MPM +* os/unix/unixd.[ch]: detach, setuid, setgid, stuff which will be common + amongst the unix MPMs + * mpm_prefork: throw away all the alarm/timeout crud; and clean up the signal handling for the new world order. [Dean Gaudet] 1.2 +13 -13apache-2.0/mpm/src/include/http_config.h Index: http_config.h === RCS file: /home/cvs/apache-2.0/mpm/src/include/http_config.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- http_config.h 1999/06/18 18:39:28 1.1 +++ http_config.h 1999/06/20 22:59:50 1.2 @@ -311,6 +311,19 @@ /* for implementing subconfigs and customized config files */ API_EXPORT(const char *) ap_srm_command_loop(cmd_parms *parms, void *config); +/* ap_check_cmd_context() definitions: */ +API_EXPORT(const char *) ap_check_cmd_context(cmd_parms *cmd, unsigned forbidden); + +/* ap_check_cmd_context(): Forbidden in: */ +#define NOT_IN_VIRTUALHOST 0x01 /* Virtualhost */ +#define NOT_IN_LIMIT 0x02 /* Limit */ +#define NOT_IN_DIRECTORY 0x04 /* Directory */ +#define NOT_IN_LOCATION0x08 /* Location */ +#define NOT_IN_FILES 0x10 /* Files */ +#define NOT_IN_DIR_LOC_FILE (NOT_IN_DIRECTORY|NOT_IN_LOCATION|NOT_IN_FILES) /* Directory/Location/Files*/ +#define GLOBAL_ONLY (NOT_IN_VIRTUALHOST|NOT_IN_LIMIT|NOT_IN_DIR_LOC_FILE) + + #ifdef CORE_PRIVATE extern API_VAR_EXPORT module *top_module; @@ -349,19 +362,6 @@ CORE_EXPORT(const char *) ap_init_virtual_host(pool *p, const char *hostname, server_rec *main_server, server_rec **); void ap_process_resource_config(server_rec *s, const char *fname, pool *p, pool *ptemp); - -/* ap_check_cmd_context() definitions: */ -API_EXPORT(const char *) ap_check_cmd_context(cmd_parms *cmd, unsigned forbidden); - -/* ap_check_cmd_context(): Forbidden in: */ -#define NOT_IN_VIRTUALHOST 0x01 /* Virtualhost */ -#define NOT_IN_LIMIT 0x02 /* Limit */ -#define NOT_IN_DIRECTORY 0x04 /* Directory */ -#define NOT_IN_LOCATION0x08 /* Location */ -#define NOT_IN_FILES 0x10 /* Files */ -#define NOT_IN_DIR_LOC_FILE (NOT_IN_DIRECTORY|NOT_IN_LOCATION|NOT_IN_FILES) /* Directory/Location/Files*/ -#define GLOBAL_ONLY (NOT_IN_VIRTUALHOST|NOT_IN_LIMIT|NOT_IN_DIR_LOC_FILE) - /* Module-method dispatchers, also for http_request.c */ 1.6 +13 -218 apache-2.0/mpm/src/main/mpm_prefork.c Index: mpm_prefork.c === RCS file: /home/cvs/apache-2.0/mpm/src/main/mpm_prefork.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mpm_prefork.c 1999/06/20 21:46:13 1.5 +++ mpm_prefork.c 1999/06/20 22:59:51 1.6 @@ -96,6 +96,7 @@ #include http_connection.h #include scoreboard_prefork.h #include ap_mpm.h +#include unixd.h #ifdef USE_SHMGET_SCOREBOARD #include sys/types.h #include sys/ipc.h @@ -108,12 +109,6 @@ /* config globals */ -static uid_t ap_user_id=0; -static char *ap_user_name=NULL; -static gid_t ap_group_id=0; -#ifdef MULTIPLE_GROUPS -static gid_t group_id_list[NGROUPS_MAX]; -#endif static int ap_max_requests_per_child=0; static char *ap_pid_fname=NULL; static char *ap_scoreboard_fname=NULL; @@ -163,7 +158,6 @@ static int sd; static fd_set listenfds; static int listenmaxfd; -static pid_t pgrp; /* one_process --- debugging mode variable; can be set from the command line * with the -X flag. If set, this gets you the child_main loop running @@ -502,8 +496,8 @@ /* restrict it to use only by the appropriate user_id ... not that this * stops CGIs from acquiring it and dinking around with it. */ - buf.sem_perm.uid = ap_user_id; - buf.sem_perm.gid = ap_group_id; + buf.sem_perm.uid = unixd_config.user_id; + buf.sem_perm.gid
cvs commit: apache-2.0/mpm/src/main iol_unix.c Makefile.tmpl buff.c http_connection.c http_protocol.c http_request.c
dgaudet 99/06/18 16:35:01
Modified:mpm/src CHANGES
mpm/src/include buff.h
mpm/src/main Makefile.tmpl buff.c http_connection.c
http_protocol.c http_request.c
Added: mpm/src/docs buff.txt
mpm/src/include ap_iol.h
mpm/src/main iol_unix.c
Log:
I'm sure this is wrong... but it's my start. i/o layering. Lots of stuff
disabled/still to be implemented. This served up a few static requests.
Revision ChangesPath
1.3 +7 -0 apache-2.0/mpm/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-2.0/mpm/src/CHANGES,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CHANGES 1999/06/18 18:58:45 1.2
+++ CHANGES 1999/06/18 23:34:56 1.3
@@ -0,0 +1,7 @@
+Changes with MPM
+
+* I/O layering and BUFF revamp. See docs/buff.txt. [Dean Gaudet]
+
+* Basic restructuring to introduce the MPM concept; includes various
+ changes to the module API... better described by
+ docs/initial_blurb.txt. [Dean Gaudet]
1.1 apache-2.0/mpm/src/docs/buff.txt
Index: buff.txt
===
- ap_bungetc added
- ap_blookc changed to return the character, rather than take a char *buff
- in theory, errno is always useful on return from a BUFF routine
- ap_bhalfduplex, B_SAFEREAD will be re-implemented using a layer I think
- chunking gone for now, will return as a layer
- ebcdic gone for now... it should be a layer
1.3 +15 -15apache-2.0/mpm/src/include/buff.h
Index: buff.h
===
RCS file: /home/cvs/apache-2.0/mpm/src/include/buff.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- buff.h1999/06/18 19:20:47 1.2
+++ buff.h1999/06/18 23:34:58 1.3
@@ -63,6 +63,7 @@
#endif
#include stdarg.h
+#include ap_iol.h
/* Reading is buffered */
#define B_RD (1)
@@ -83,16 +84,22 @@
#define B_ERROR (48)
/* TODO: implement chunked encoding as a layer */
/* bflush() if a read would block */
-#define B_SAFEREAD (128)
+/* TODO: #define B_SAFEREAD (128) */
/* buffer is a socket */
#define B_SOCKET (256)
+/* caller expects non-blocking behaviour */
+#define B_NONBLOCK (512)
+/* non-blocking bit set on fd */
+#define B_NONBLOCK_SET (1024)
+
/* TODO: implement a ebcdic/ascii conversion layers */
typedef struct buff_struct BUFF;
struct buff_struct {
int flags; /* flags */
+int saved_errno; /* saved errno */
unsigned char *inptr;/* pointer to next location to read */
int incnt; /* number of bytes left to read from
input buffer;
* always 0 if had a read error */
@@ -106,14 +113,13 @@
ap_pool *pool;
-/* could also put pointers to the basic I/O routines here */
-int fd; /* the file descriptor */
-time_t timeout; /* timeout for B_SOCKET operations */
+ap_iol iol;
};
/* Options to bset/getopt */
#define BO_BYTECT (1)
#define BO_TIMEOUT (2)
+#define BO_ERROR (3)
/* Stream creation and modification */
API_EXPORT(BUFF *) ap_bcreate(pool *p, int flags);
@@ -136,8 +142,7 @@
/* I/O */
API_EXPORT(int) ap_bread(BUFF *fb, void *buf, int nbyte);
API_EXPORT(int) ap_bgets(char *s, int n, BUFF *fb);
-API_EXPORT(int) ap_blookc(char *buff, BUFF *fb);
-API_EXPORT(int) ap_bskiplf(BUFF *fb);
+API_EXPORT(int) ap_blookc(BUFF *fb);
API_EXPORT(int) ap_bwrite(BUFF *fb, const void *buf, int nbyte);
API_EXPORT(int) ap_bflush(BUFF *fb);
API_EXPORT(int) ap_bputs(const char *x, BUFF *fb);
@@ -153,6 +158,10 @@
#define ap_bgetc(fb) ( ((fb)-incnt == 0) ? ap_bfilbuf(fb) : \
((fb)-incnt--, *((fb)-inptr++)) )
+/* can only unput a single character that was read by ap_bgetc */
+#define ap_bungetc(c, fb) ((fb)-incnt++, *(--(fb)-inptr) = (c))
+
+
#define ap_bputc(c, fb) fb)-flags (B_EOUT|B_WRERR|B_WR)) != B_WR || \
(fb)-outcnt == (fb)-bufsiz) ? ap_bflsbuf(c, (fb)) : \
((fb)-outbase[(fb)-outcnt++] = (c), 0))
@@ -181,15 +190,6 @@
API_EXPORT(int) ap_bspawn_child(pool *, int (*)(void *, child_info *), void
*,
enum kill_conditions, BUFF **pipe_in,
BUFF **pipe_out,
BUFF **pipe_err);
-
-/* enable non-blocking operations */
-API_EXPORT(int) ap_bnonblock(int fd);
-API_EXPORT(int) ap_bblock(int fd);
-/* and get an fd to select() on */
-API_EXPORT(int) ap_bfileno(BUFF *fb, int direction
cvs commit: apache-2.0/mpm/src/docs buff.txt
dgaudet 99/06/18 17:17:51 Modified:mpm/src/docs buff.txt Log: rambling on Revision ChangesPath 1.2 +77 -0 apache-2.0/mpm/src/docs/buff.txt Index: buff.txt === RCS file: /home/cvs/apache-2.0/mpm/src/docs/buff.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- buff.txt 1999/06/18 23:34:57 1.1 +++ buff.txt 1999/06/19 00:17:51 1.2 @@ -1,6 +1,83 @@ +goals? we need an i/o abstraction which has these properties: + +- buffered and non-buffered modes + +The buffered mode should look like FILE *. + +The non-buffered mode should look more like read(2)/write(2). + +- blocking and non-blocking modes + +The blocking mode is the easy mode -- it's what most module writers +will see. The non-blocking mode is the hard mode, this is where +module writers wanting to squeeze out some speed will have to play. +In order to build async/sync hybrid models we need the +non-blocking i/o abstraction. + +- timed reads and writes (for blocking cases) + +This is part of my jihad against asynchronous notification. + +- i/o filtering or layering + +Yet another Holy Grail of computing. But I digress. These are +hard when you take into consideration non-blocking i/o -- you have +to keep lots of state. I expect our core filters will all support +non-blocking i/o, well at least the ones I need to make sure we kick +ass on benchmarks. A filter can deny a switch to non-blocking mode, +the server will have to recover gracefully (ha). + +- copy-avoidance + +Hey what about zero copy a la IO-Lite? After having experienced it +in a production setting I'm no longer convinced of its benefits. +There is an enormous amount of overhead keeping lists of buffers, +and reference counts, and cleanup functions, and such which requires +a lot of tuning to get right. I think there may be something here, +but it's not a cakewalk. + +What I do know is that the heuristics I put into apache-1.3 to choose +writev() at times are almost as good as what you can get from doing +full zero-copy in the cases we *currently* care about. To put it +another way, let's wait another generation to deal with zero copy. + +But sendfile/transmitfile/etc. those are still interesting. + +So instead of listing zero copy as a property, I'll list +copy-avoidance. + +So far? + - ap_bungetc added - ap_blookc changed to return the character, rather than take a char *buff - in theory, errno is always useful on return from a BUFF routine - ap_bhalfduplex, B_SAFEREAD will be re-implemented using a layer I think - chunking gone for now, will return as a layer - ebcdic gone for now... it should be a layer + +- ap_iol.h defined, first crack at the layers... + +Step back a second to think on it. Much like we have fread(3) +and read(2), I've got a BUFF and an ap_iol abstraction. An ap_iol +could use a BUFF if it requires some form of buffering, but many +won't require buffering... or can do a better job themselves. + +Consider filters such as: + - ebcdic - ascii + - encryption + - compression +These all share the property that no matter what, they're going to make +an extra copy of the data. In some cases they can do it in place (read) +or into a fixed buffer... in most cases their buffering requirements +are different than what BUFF offers. + +Consider a filter such as chunking. This could actually use the writev +method to get its job done... depends on the chunks being used. This +is where zero-copy would be really nice, but we can get by with a few +heuristics. + +At any rate -- the NSPR folks didn't see any reason to included a +buffered i/o abstraction on top of their layered i/o abstraction... so +I feel like I'm not the only one who's thinking this way. + +- iol_unix.c implemented... should hold us for a bit
cvs commit: apache-2.0/mpm/src/main iol_unix.c
dgaudet 99/06/19 10:59:58 Modified:mpm/src/main iol_unix.c Log: cleanup Revision ChangesPath 1.2 +0 -2 apache-2.0/mpm/src/main/iol_unix.c Index: iol_unix.c === RCS file: /home/cvs/apache-2.0/mpm/src/main/iol_unix.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- iol_unix.c1999/06/18 23:35:00 1.1 +++ iol_unix.c1999/06/19 17:59:57 1.2 @@ -57,8 +57,6 @@ #include httpd.h -#include http_main.h -#include http_log.h #include ap_iol.h #include errno.h
cvs commit: apache-2.0/mpm/src/modules/standard mod_access.c mod_actions.c mod_alias.c mod_asis.c mod_auth.c mod_autoindex.c mod_cgi.c mod_imap.c mod_include.c mod_log_config.c mod_negotiation.c mod_setenvif.c mod_userdir.c
dgaudet 99/06/19 11:10:12
Modified:mpm/src CHANGES Configuration.mpm
mpm/src/modules/standard mod_access.c mod_actions.c
mod_alias.c mod_asis.c mod_auth.c mod_autoindex.c
mod_cgi.c mod_imap.c mod_include.c mod_log_config.c
mod_negotiation.c mod_setenvif.c mod_userdir.c
Log:
Port a bunch of modules to the new module structure.
(All the ones currently activated in Configuration.mpm plus cgi
and include... but I didn't activate those because dynamic content
is broken until I fix chunking.)
Submitted by: Michael H. Voase [EMAIL PROTECTED]
Revision ChangesPath
1.4 +3 -0 apache-2.0/mpm/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-2.0/mpm/src/CHANGES,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CHANGES 1999/06/18 23:34:56 1.3
+++ CHANGES 1999/06/19 18:10:03 1.4
@@ -1,5 +1,8 @@
Changes with MPM
+* Port a bunch of modules to the new module structure.
+ [Michael H. Voase [EMAIL PROTECTED]]
+
* I/O layering and BUFF revamp. See docs/buff.txt. [Dean Gaudet]
* Basic restructuring to introduce the MPM concept; includes various
1.3 +10 -10apache-2.0/mpm/src/Configuration.mpm
Index: Configuration.mpm
===
RCS file: /home/cvs/apache-2.0/mpm/src/Configuration.mpm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Configuration.mpm 1999/06/18 19:20:18 1.2
+++ Configuration.mpm 1999/06/19 18:10:03 1.3
@@ -23,28 +23,28 @@
Rule WANTHSREGEX=default
# AddModule modules/experimental/mod_mmap_static.o
# AddModule modules/standard/mod_env.o
-# AddModule modules/standard/mod_log_config.o
+AddModule modules/standard/mod_log_config.o
# AddModule modules/standard/mod_log_agent.o
# AddModule modules/standard/mod_log_referer.o
# AddModule modules/standard/mod_mime_magic.o
AddModule modules/standard/mod_mime.o
-# AddModule modules/standard/mod_negotiation.o
+AddModule modules/standard/mod_negotiation.o
# AddModule modules/standard/mod_status.o
# AddModule modules/standard/mod_info.o
# AddModule modules/standard/mod_include.o
-# AddModule modules/standard/mod_autoindex.o
+AddModule modules/standard/mod_autoindex.o
AddModule modules/standard/mod_dir.o
# AddModule modules/standard/mod_cgi.o
-# AddModule modules/standard/mod_asis.o
-# AddModule modules/standard/mod_imap.o
+AddModule modules/standard/mod_asis.o
+AddModule modules/standard/mod_imap.o
# AddModule modules/standard/mod_actions.o
# AddModule modules/standard/mod_speling.o
-# AddModule modules/standard/mod_userdir.o
+AddModule modules/standard/mod_userdir.o
# AddModule modules/proxy/libproxy.a
-# AddModule modules/standard/mod_alias.o
+AddModule modules/standard/mod_alias.o
# AddModule modules/standard/mod_rewrite.o
-# AddModule modules/standard/mod_access.o
-# AddModule modules/standard/mod_auth.o
+AddModule modules/standard/mod_access.o
+AddModule modules/standard/mod_auth.o
# AddModule modules/standard/mod_auth_anon.o
# AddModule modules/standard/mod_auth_dbm.o
# AddModule modules/standard/mod_auth_db.o
@@ -56,4 +56,4 @@
# AddModule modules/example/mod_example.o
# AddModule modules/standard/mod_unique_id.o
# AddModule modules/standard/mod_so.o
-# AddModule modules/standard/mod_setenvif.o
+AddModule modules/standard/mod_setenvif.o
1.2 +5 -3 apache-2.0/mpm/src/modules/standard/mod_access.c
Index: mod_access.c
===
RCS file: /home/cvs/apache-2.0/mpm/src/modules/standard/mod_access.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_access.c 1999/06/18 18:39:35 1.1
+++ mod_access.c 1999/06/19 18:10:04 1.2
@@ -388,7 +388,11 @@
module MODULE_VAR_EXPORT access_module =
{
-STANDARD_MODULE_STUFF,
+STANDARD20_MODULE_STUFF,
+NULL,/* pre_command */
+NULL,/* pre_config */
+NULL,/* post_config */
+NULL,/* open_logs */
NULL,/* initializer */
create_access_dir_config,/* dir config creater */
NULL,/* dir merger --- default is to override */
@@ -404,7 +408,5 @@
NULL,/* fixups */
NULL,/* logger */
NULL,/* header parser */
-NULL,/* child_init */
-NULL,/* child_exit */
NULL /* post read-request */
};
1.2 +6 -4 apache-2.0
cvs commit: apache-2.0/mpm/src/main iol_unix.c
dgaudet 99/06/19 13:40:18
Modified:mpm/src/include ap_iol.h
mpm/src/main iol_unix.c
Log:
use ETIMEDOUT instead of ETIME
Revision ChangesPath
1.2 +1 -1 apache-2.0/mpm/src/include/ap_iol.h
Index: ap_iol.h
===
RCS file: /home/cvs/apache-2.0/mpm/src/include/ap_iol.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ap_iol.h 1999/06/18 23:34:57 1.1
+++ ap_iol.h 1999/06/19 20:40:16 1.2
@@ -80,7 +80,7 @@
If the timeout is positive, they will block up to the specified number
of seconds. If the read/write can't be completed in that time,
-a -1 will be returned and errno will be set to ETIME.
+a -1 will be returned and errno will be set to ETIMEDOUT.
TODO: we've all agreed errno is somewhat evil, and it must be replaced
by a status result code. I'll leave that to someone else.
1.4 +1 -5 apache-2.0/mpm/src/main/iol_unix.c
Index: iol_unix.c
===
RCS file: /home/cvs/apache-2.0/mpm/src/main/iol_unix.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- iol_unix.c1999/06/19 20:23:37 1.3
+++ iol_unix.c1999/06/19 20:40:17 1.4
@@ -63,10 +63,6 @@
#include sys/types.h
#include sys/uio.h
-#ifndef ETIME
-# define ETIME -1
-#endif
-
#define FD_NONBLOCKING_SET (1)
typedef struct {
@@ -146,7 +142,7 @@
rv = select(fd-fd + 1, selread, selwrite, NULL, fd-timeout 0 ?
NULL : tv); \
} while (rv == -1 errno == EINTR); \
if (!FD_ISSET(fd-fd, fdset)) { \
- errno = ETIME; \
+ errno = ETIMEDOUT; \
return -1; \
} \
do { \
cvs commit: apache-2.0/mpm/src/include ap_buf.h
dgaudet 99/06/19 13:42:01
Modified:mpm/src/ap Makefile.tmpl
Added: mpm/src/ap ap_buf.c
mpm/src/include ap_buf.h
Log:
this is where I'm going with the zero-copy stuff
Revision ChangesPath
1.3 +1 -1 apache-2.0/mpm/src/ap/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /home/cvs/apache-2.0/mpm/src/ap/Makefile.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.tmpl 1999/06/18 19:07:57 1.2
+++ Makefile.tmpl 1999/06/19 20:41:59 1.3
@@ -6,7 +6,7 @@
LIB=libap.a
OBJS=ap_cpystrn.o ap_execve.o ap_fnmatch.o ap_getpass.o ap_md5c.o
ap_signal.o \
- ap_slack.o ap_snprintf.o
+ ap_slack.o ap_snprintf.o ap_buf.o
.c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $
1.1 apache-2.0/mpm/src/ap/ap_buf.c
Index: ap_buf.c
===
/*
* Copyright (c) 1996-1999 The Apache Group. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. All advertising materials mentioning features or use of this
*software must display the following acknowledgment:
*This product includes software developed by the Apache Group
*for use in the Apache HTTP server project (http://www.apache.org/).
*
* 4. The names Apache Server and Apache Group must not be used to
*endorse or promote products derived from this software without
*prior written permission. For written permission, please contact
*[EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called Apache
*nor may Apache appear in their names without prior written
*permission of the Apache Group.
*
* 6. Redistributions of any form whatsoever must retain the following
*acknowledgment:
*This product includes software developed by the Apache Group
*for use in the Apache HTTP server project (http://www.apache.org/).
*
* THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Group and was originally based
* on public domain software written at the National Center for
* Supercomputing Applications, University of Illinois, Urbana-Champaign.
* For more information on the Apache Group and the Apache HTTP server
* project, please see http://www.apache.org/.
*
*/
#include ap_config.h
#include stdlib.h
#include sys/uio.h
#include ap_buf.h
API_EXPORT(ap_bufel *) ap_bufel_new(void)
{
/* TODO: keep a free list of ap_bufels... and allocate them in big chunks
*/
return malloc(sizeof(ap_bufel));
}
API_EXPORT(void) ap_bufel_destroy(ap_bufel *e)
{
e-free(e);
free(e);
}
API_EXPORT(void) ap_buf_init(ap_buf *b)
{
b-head = NULL;
b-tail = b-head;
}
API_EXPORT(void) ap_buf_append(ap_buf *b, ap_bufel *e)
{
e-next = *b-tail;
b-tail = e-next;
}
API_EXPORT(void) ap_buf_consume(ap_buf *b, int nbytes)
{
ap_bufel *e;
ap_bufel *n;
int amt;
e = b-head;
while (e nbytes) {
amt = e-end - e-start;
if (nbytes amt) {
e-start += nbytes;
break;
}
n = e-next;
ap_bufel_destroy(e);
nbytes -= amt;
e = n;
}
b-head = e;
if (!e) {
b-tail = b-head
cvs commit: apache-2.0/mpm/src/main mpm_prefork.c
dgaudet 99/06/19 14:56:28
Modified:mpm/src/main mpm_prefork.c
Log:
Ben L. was complaining that he wanted -X ... try -D ONE_PROCESS now
instead. The general problem is that mpms need arbitrary extensions to
the command line options... -D seems somewhat reasonable. Although I
can think of better stuff. This works for now.
Revision ChangesPath
1.2 +3 -1 apache-2.0/mpm/src/main/mpm_prefork.c
Index: mpm_prefork.c
===
RCS file: /home/cvs/apache-2.0/mpm/src/main/mpm_prefork.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mpm_prefork.c 1999/06/18 18:39:31 1.1
+++ mpm_prefork.c 1999/06/19 21:56:27 1.2
@@ -3680,12 +3680,14 @@
{
static int restart_num = 0;
+one_process = ap_exists_config_define(ONE_PROCESS);
+
/* sigh, want this only the second time around */
if (restart_num++ == 1) {
is_graceful = 0;
if (!one_process) {
- //detach();
+ /* TODO: detach(); ... it should work fine, this is just easier for
debugging */
}
my_pid = getpid();
cvs commit: apache-2.0/mpm - Imported sources
dgaudet 99/06/18 11:40:00 Log: import mpm-3 into the apache-2.0 repository Status: Vendor Tag: dgaudet Release Tags: mpm-3 N apache-2.0/mpm/ABOUT_APACHE N apache-2.0/mpm/Announcement N apache-2.0/mpm/INSTALL N apache-2.0/mpm/KEYS N apache-2.0/mpm/LICENSE N apache-2.0/mpm/Makefile.tmpl N apache-2.0/mpm/README N apache-2.0/mpm/README.NT N apache-2.0/mpm/README.configure N apache-2.0/mpm/RULES.CVS N apache-2.0/mpm/WARNING-NT.TXT N apache-2.0/mpm/config.layout N apache-2.0/mpm/configure N apache-2.0/mpm/config.status N apache-2.0/mpm/Makefile N apache-2.0/mpm/cgi-bin/printenv N apache-2.0/mpm/cgi-bin/test-cgi N apache-2.0/mpm/conf/.cvsignore N apache-2.0/mpm/conf/access.conf-dist N apache-2.0/mpm/conf/access.conf-dist-win N apache-2.0/mpm/conf/highperformance.conf-dist N apache-2.0/mpm/conf/httpd.conf-dist N apache-2.0/mpm/conf/httpd.conf-dist-win N apache-2.0/mpm/conf/magic N apache-2.0/mpm/conf/mime.types N apache-2.0/mpm/conf/srm.conf-dist N apache-2.0/mpm/conf/srm.conf-dist-win N apache-2.0/mpm/icons/back.gif N apache-2.0/mpm/icons/README N apache-2.0/mpm/icons/a.gif N apache-2.0/mpm/icons/alert.black.gif N apache-2.0/mpm/icons/alert.red.gif N apache-2.0/mpm/icons/apache_pb.gif N apache-2.0/mpm/icons/ball.gray.gif N apache-2.0/mpm/icons/ball.red.gif N apache-2.0/mpm/icons/binary.gif N apache-2.0/mpm/icons/binhex.gif N apache-2.0/mpm/icons/blank.gif N apache-2.0/mpm/icons/bomb.gif N apache-2.0/mpm/icons/box1.gif N apache-2.0/mpm/icons/box2.gif N apache-2.0/mpm/icons/broken.gif N apache-2.0/mpm/icons/burst.gif N apache-2.0/mpm/icons/c.gif N apache-2.0/mpm/icons/comp.blue.gif N apache-2.0/mpm/icons/comp.gray.gif N apache-2.0/mpm/icons/compressed.gif N apache-2.0/mpm/icons/continued.gif N apache-2.0/mpm/icons/dir.gif N apache-2.0/mpm/icons/dvi.gif N apache-2.0/mpm/icons/down.gif N apache-2.0/mpm/icons/f.gif N apache-2.0/mpm/icons/folder.gif N apache-2.0/mpm/icons/folder.open.gif N apache-2.0/mpm/icons/folder.sec.gif N apache-2.0/mpm/icons/forward.gif N apache-2.0/mpm/icons/generic.gif N apache-2.0/mpm/icons/generic.red.gif N apache-2.0/mpm/icons/generic.sec.gif N apache-2.0/mpm/icons/hand.right.gif N apache-2.0/mpm/icons/hand.up.gif N apache-2.0/mpm/icons/icon.sheet.gif N apache-2.0/mpm/icons/image1.gif N apache-2.0/mpm/icons/image2.gif N apache-2.0/mpm/icons/image3.gif N apache-2.0/mpm/icons/index.gif N apache-2.0/mpm/icons/layout.gif N apache-2.0/mpm/icons/left.gif N apache-2.0/mpm/icons/link.gif N apache-2.0/mpm/icons/movie.gif N apache-2.0/mpm/icons/p.gif N apache-2.0/mpm/icons/patch.gif N apache-2.0/mpm/icons/pdf.gif N apache-2.0/mpm/icons/pie0.gif N apache-2.0/mpm/icons/pie1.gif N apache-2.0/mpm/icons/pie2.gif N apache-2.0/mpm/icons/pie3.gif N apache-2.0/mpm/icons/pie4.gif N apache-2.0/mpm/icons/pie5.gif N apache-2.0/mpm/icons/pie6.gif N apache-2.0/mpm/icons/pie7.gif N apache-2.0/mpm/icons/pie8.gif N apache-2.0/mpm/icons/portal.gif N apache-2.0/mpm/icons/ps.gif N apache-2.0/mpm/icons/quill.gif N apache-2.0/mpm/icons/right.gif N apache-2.0/mpm/icons/screw1.gif N apache-2.0/mpm/icons/screw2.gif N apache-2.0/mpm/icons/script.gif N apache-2.0/mpm/icons/sound1.gif N apache-2.0/mpm/icons/sound2.gif N apache-2.0/mpm/icons/sphere1.gif N apache-2.0/mpm/icons/sphere2.gif N apache-2.0/mpm/icons/tar.gif N apache-2.0/mpm/icons/tex.gif N apache-2.0/mpm/icons/text.gif N apache-2.0/mpm/icons/transfer.gif N apache-2.0/mpm/icons/unknown.gif N apache-2.0/mpm/icons/up.gif N apache-2.0/mpm/icons/uu.gif N apache-2.0/mpm/icons/uuencoded.gif N apache-2.0/mpm/icons/world1.gif N apache-2.0/mpm/icons/world2.gif N apache-2.0/mpm/icons/small/README.txt N apache-2.0/mpm/icons/small/back.gif N apache-2.0/mpm/icons/small/binary.gif N apache-2.0/mpm/icons/small/binhex.gif N apache-2.0/mpm/icons/small/blank.gif N apache-2.0/mpm/icons/small/broken.gif N apache-2.0/mpm/icons/small/burst.gif N apache-2.0/mpm/icons/small/comp1.gif N apache-2.0/mpm/icons/small/comp2.gif N apache-2.0/mpm/icons/small/compressed.gif N apache-2.0/mpm/icons/small/continued.gif N apache-2.0/mpm/icons/small/dir.gif N apache-2.0/mpm/icons/small/dir2.gif N apache-2.0/mpm/icons/small/doc.gif N apache-2.0/mpm/icons/small/forward.gif N apache-2.0/mpm/icons/small/generic.gif N apache-2.0/mpm/icons/small/generic2.gif N apache-2.0/mpm/icons/small/generic3.gif N apache-2.0/mpm/icons/small/image.gif N apache-2.0/mpm/icons/small/image2.gif N apache-2.0/mpm/icons/small/index.gif N apache-2.0/mpm/icons/small/key.gif N apache-2.0/mpm/icons/small/movie.gif N apache-2.0/mpm/icons/small/patch.gif N apache-2.0/mpm/icons/small/ps.gif N apache-2.0/mpm/icons/small/rainbow.gif N apache-2.0/mpm/icons/small/sound.gif N apache-2.0/mpm/icons/small/sound2.gif N apache-2.0/mpm/icons/small/tar.gif N apache
cvs commit: apache-2.0/mpm/src/docs - New directory
dgaudet 99/06/18 11:43:13 apache-2.0/mpm/src/docs - New directory
cvs commit: apache-2.0/mpm/src/docs goals.txt initial_blurb.txt tls.txt
dgaudet 99/06/18 11:46:55 Added: mpm/src/docs goals.txt initial_blurb.txt tls.txt Log: add in some of the discussion Revision ChangesPath 1.1 apache-2.0/mpm/src/docs/goals.txt Index: goals.txt === From [EMAIL PROTECTED] Fri Jun 18 11:46:10 1999 Date: Fri, 18 Jun 1999 09:46:51 -0700 (PDT) From: Dean Gaudet [EMAIL PROTECTED] To: new-httpd@apache.org Subject: Re: work in progress: mpm-3.tar.gz X-Comment: Visit http://www.arctic.org/~dgaudet/legal for information regarding copyright and disclaimer. Reply-To: new-httpd@apache.org Yup it's a great idea waiting for someone to take it by the reins and implement it :) A lot of folks in the past (in the group, and not in the group) have asked me how can I help with 2.0? I'm trying to lay out a bunch of projects that will help me with this rearchitecture... and, if I can be so bold, I suspect that this is how we can finally get 2.0 going. The stuff I'm doing is something which has been long overdue, and which is necessary for many of the plans that we've been thinking of. I intend to make the feature set of mpm so desirable to unix-heads that they want to help clean it up, re-implement various 1.x features in it, and say this is apache 2.0. I intend to make the feature set of mpm general enough that non-unix-heads see exactly where they can plug in a new kick-ass model that suits their architecture... such as completion ports for NT. Previously these folks had to hack into the utter horrid mess of http_main, and there was much duplicated code. My goal (and I think I've accomplished it in this first version) is to abstract the real purpose of the main loop inside http_main so that it can be replaced with architecture specific main loops. Yes I'm a unix-bigot, but even within the unix world there are several possibilities for the MPM, and I want to be sure that people can implement all of them. There's a fellow Zach from redhat who just implemented what is probably the fastest userland model for linux, and he's waiting to plug it into apache somehow. There's a sun dude waiting to plug in solaris 7's in-kernel accelerator. I want to accomodate all of them. Hence the modular design of the MPM. Some day we'll have a portable run-time, and that day we'll integrate it with the MPM. I intend to ignore this issue for the moment, because we can't afford to wait any longer for the holy grail portable run-time... and I think it'll be obvious to the APR (or NSPR) folks how they too can plug into the MPM; but they're going to have to wait for layered BUFF first. At the moment this is dean's fork of apache, and I intend to play dictator on it for a while. I have some very specific goals for it, and I want people to see where I'm going first before I release control. I do want this to become apache 2.0 though, so I'm trying to accomodate enough people to make it acceptable. But I could really use help as I've outlined -- at best I'm going to have prototype quality code; we've got a couple months of cleanup and testing before it'll be beta quality. OK back to hacking :) Dean On Fri, 18 Jun 1999, Ralf S. Engelschall wrote: In article [EMAIL PROTECTED] you wrote: Oh, and another TODO which can happen now, before the modules are converted to the new structure... is to change the module structure to have only one on_load method, and have all other methods registered at run time. Yeah, that's a great idea. +1 We really have to get rid of the unflexible fixed dispatch lists... Ralf S. Engelschall [EMAIL PROTECTED] www.engelschall.com 1.1 apache-2.0/mpm/src/docs/initial_blurb.txt Index: initial_blurb.txt === From [EMAIL PROTECTED] Fri Jun 18 11:43:50 1999 Date: Thu, 17 Jun 1999 12:23:59 -0700 (PDT) From: Dean Gaudet [EMAIL PROTECTED] To: new-httpd@apache.org Subject: work in progress: mpm-3.tar.gz X-Comment: Visit http://www.arctic.org/~dgaudet/legal for information regarding copyright and disclaimer. Reply-To: new-httpd@apache.org This is the beginning of some massive code cleanup... we've been building so much crap into http_main it's been really difficult for me to work on the async/sync hybrid (ASH) stuff that I posted a few weeks back. My main goal here was to rip out the multi-processing model, or MPM, so that we can replace it with whatever we need depending on the platform. For example, there could be a prefork MPM, a win32 MPM, a select/thread hybrid MPM, a tpf MPM, ... The MPM's job is to listen
cvs commit: apache-2.0/mpm/src CHANGES BUILD.NOTES INDENT INSTALL PORTING README README.EBCDIC
dgaudet 99/06/18 11:58:49 Modified:mpm/src CHANGES Removed: mpm/src BUILD.NOTES INDENT INSTALL PORTING README README.EBCDIC Log: cleanup... rewrite the help later... clean state for changes for now Revision ChangesPath 1.2 +0 -6687 apache-2.0/mpm/src/CHANGES Binary file
cvs commit: apache-2.0/mpm 00README_FIRST_REALLY
dgaudet 99/06/18 12:00:18 Added: mpm 00README_FIRST_REALLY Log: ignore the man behind the curtain Revision ChangesPath 1.1 apache-2.0/mpm/00README_FIRST_REALLY Index: 00README_FIRST_REALLY === This is a work in progress, don't believe anything you read in the docs at this level of the tree. Save yourself a headache and cd src and start working there. Dean
cvs commit: apache-2.0/mpm/src/lib/expat-lite Makefile.tmpl
dgaudet 99/06/18 12:04:23 Modified:mpm/src/lib/expat-lite Makefile.tmpl Log: someone needs to put a depend rule into here Revision ChangesPath 1.2 +2 -0 apache-2.0/mpm/src/lib/expat-lite/Makefile.tmpl Index: Makefile.tmpl === RCS file: /home/cvs/apache-2.0/mpm/src/lib/expat-lite/Makefile.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.tmpl 1999/06/18 18:39:24 1.1 +++ Makefile.tmpl 1999/06/18 19:04:21 1.2 @@ -29,3 +29,5 @@ .c.o: $(CC) -c $(INCLUDES) $(CFLAGS) $ + +depend:
cvs commit: apache-2.0/mpm/src/os/unix Makefile.tmpl
dgaudet 99/06/18 12:08:08 Modified:mpm/src/ap Makefile.tmpl mpm/src Makefile.tmpl mpm/src/main Makefile.tmpl mpm/src/modules/standard Makefile.tmpl mpm/src/os/unix Makefile.tmpl Log: update dependencies Revision ChangesPath 1.2 +8 -7 apache-2.0/mpm/src/ap/Makefile.tmpl Index: Makefile.tmpl === RCS file: /home/cvs/apache-2.0/mpm/src/ap/Makefile.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.tmpl 1999/06/18 18:39:23 1.1 +++ Makefile.tmpl 1999/06/18 19:07:57 1.2 @@ -42,35 +42,36 @@ ap_cpystrn.o: ap_cpystrn.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/apr.h \ $(INCDIR)/util_uri.h ap_execve.o: ap_execve.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/apr.h \ $(INCDIR)/util_uri.h ap_fnmatch.o: ap_fnmatch.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \ $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/fnmatch.h ap_getpass.o: ap_getpass.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \ - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap.h + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap.h \ + $(INCDIR)/apr.h ap_md5c.o: ap_md5c.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \ $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap_md5.h \ - $(INCDIR)/ap.h + $(INCDIR)/ap.h $(INCDIR)/apr.h ap_signal.o: ap_signal.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/apr.h \ $(INCDIR)/util_uri.h ap_slack.o: ap_slack.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/apr.h \ $(INCDIR)/util_uri.h $(INCDIR)/http_log.h ap_snprintf.o: ap_snprintf.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \ - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/apr.h \ $(INCDIR)/util_uri.h 1.2 +6 -5 apache-2.0/mpm/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /home/cvs/apache-2.0/mpm/src/Makefile.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.tmpl 1999/06/18 18:39:23 1.1 +++ Makefile.tmpl 1999/06/18 19:07:59 1.2 @@ -122,10 +122,11 @@ # DO NOT REMOVE buildmark.o: buildmark.c include/ap_config.h include/ap_mmn.h \ - include/ap_config_auto.h os/unix/os.h include/ap_ctype.h \ - include/hsregex.h include/httpd.h include/alloc.h include/buff.h \ - include/ap.h include/util_uri.h + include/ap_config_auto.h os/unix/os.h os/unix/os-inline.c \ + include/ap_ctype.h include/hsregex.h include/httpd.h include/alloc.h \ + include/buff.h include/ap.h include/apr.h include/util_uri.h modules.o: modules.c include/httpd.h include/ap_config.h \ include/ap_mmn.h include/ap_config_auto.h os/unix/os.h \ - include/ap_ctype.h include/hsregex.h include/alloc.h include/buff.h \ - include/ap.h include/util_uri.h include/http_config.h + os/unix/os-inline.c include/ap_ctype.h include/hsregex.h \ + include/alloc.h include/buff.h include/ap.h include/apr.h \ + include/util_uri.h include/http_config.h 1.2 +34 -63apache-2.0/mpm/src/main/Makefile.tmpl Index: Makefile.tmpl === RCS file: /home/cvs/apache-2.0/mpm/src/main/Makefile.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.tmpl 1999/06/18 18:39:29 1.1 +++ Makefile.tmpl 1999/06/18 19:08:01 1.2
cvs commit: apache-2.0/mpm/src Configuration.mpm Configure
dgaudet 99/06/18 12:20:19
Modified:mpm/src Configuration.mpm Configure
Log:
lots todo
Revision ChangesPath
1.2 +1 -1 apache-2.0/mpm/src/Configuration.mpm
Index: Configuration.mpm
===
RCS file: /home/cvs/apache-2.0/mpm/src/Configuration.mpm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Configuration.mpm 1999/06/18 18:49:44 1.1
+++ Configuration.mpm 1999/06/18 19:20:18 1.2
@@ -19,7 +19,7 @@
Rule IRIXNIS=no
Rule IRIXN32=yes
Rule PARANOID=no
-Rule EXPAT=default
+Rule EXPAT=no
Rule WANTHSREGEX=default
# AddModule modules/experimental/mod_mmap_static.o
# AddModule modules/standard/mod_env.o
1.2 +6 -0 apache-2.0/mpm/src/Configure
Index: Configure
===
RCS file: /home/cvs/apache-2.0/mpm/src/Configure,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Configure 1999/06/18 18:39:23 1.1
+++ Configure 1999/06/18 19:20:18 1.2
@@ -1679,6 +1679,12 @@
## Now create modules.c
##
+
+## TODO: the mpm thing below should be controlled by a configuration
+## TODO: directive... it should really be like another module, with
+## TODO: a default selected depending on the platform
+## TODO: there should be an mpm/foo/ hierarchy for the MPM
+
$CAT $awkfile 'EOFM'
BEGIN {
modules[n++] = core
cvs commit: apache-2.0/mpm/src/main buff.c http_protocol.c
dgaudet 99/06/18 12:20:50
Modified:mpm/src/include buff.h
mpm/src/main buff.c http_protocol.c
Log:
break chunked encoding, ebcdic, ... layering goes here
Revision ChangesPath
1.2 +4 -48 apache-2.0/mpm/src/include/buff.h
Index: buff.h
===
RCS file: /home/cvs/apache-2.0/mpm/src/include/buff.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- buff.h1999/06/18 18:39:28 1.1
+++ buff.h1999/06/18 19:20:47 1.2
@@ -62,10 +62,6 @@
extern C {
#endif
-#ifdef B_SFIO
-#include sfio.h
-#endif
-
#include stdarg.h
/* Reading is buffered */
@@ -85,16 +81,13 @@
#undef B_ERROR
#endif
#define B_ERROR (48)
-/* Use chunked writing */
-#define B_CHUNK (64)
+/* TODO: implement chunked encoding as a layer */
/* bflush() if a read would block */
#define B_SAFEREAD (128)
/* buffer is a socket */
#define B_SOCKET (256)
-#ifdef CHARSET_EBCDIC
-#define B_ASCII2EBCDIC 0x4000 /* Enable conversion for this buffer */
-#define B_EBCDIC2ASCII 0x8000 /* Enable conversion for this buffer */
-#endif /*CHARSET_EBCDIC*/
+
+/* TODO: implement a ebcdic/ascii conversion layers */
typedef struct buff_struct BUFF;
@@ -103,7 +96,6 @@
unsigned char *inptr;/* pointer to next location to read */
int incnt; /* number of bytes left to read from
input buffer;
* always 0 if had a read error */
-int outchunk;/* location of chunk header when chunking */
int outcnt; /* number of byte put in output buffer
*/
unsigned char *inbase;
unsigned char *outbase;
@@ -116,29 +108,9 @@
/* could also put pointers to the basic I/O routines here */
int fd; /* the file descriptor */
-#ifdef WIN32
-HANDLE hFH; /* Windows filehandle */
-#endif
time_t timeout; /* timeout for B_SOCKET operations */
-
-/* transport handle, for RPC binding handle or some such */
-void *t_handle;
-
-#ifdef B_SFIO
-Sfio_t *sf_in;
-Sfio_t *sf_out;
-#endif
};
-#ifdef B_SFIO
-typedef struct {
-Sfdisc_t disc;
-BUFF *buff;
-} apache_sfio;
-
-extern Sfdisc_t *bsfio_new(pool *p, BUFF *b);
-#endif
-
/* Options to bset/getopt */
#define BO_BYTECT (1)
#define BO_TIMEOUT (2)
@@ -150,9 +122,6 @@
/* XXX - unused right now - mvsk */
API_EXPORT(BUFF *) ap_bopenf(pool *a, const char *name, int flg, int mode);
-#ifdef WIN32
-API_EXPORT(void) ap_bpushh(BUFF *fb, HANDLE hFH);
-#endif
API_EXPORT(int) ap_bsetopt(BUFF *fb, int optname, const void *optval);
API_EXPORT(int) ap_bgetopt(BUFF *fb, int optname, void *optval);
API_EXPORT(int) ap_bsetflag(BUFF *fb, int flag, int value);
@@ -181,27 +150,14 @@
API_EXPORT(int) ap_bflsbuf(int c, BUFF *fb);
API_EXPORT(int) ap_bfilbuf(BUFF *fb);
-#ifndef CHARSET_EBCDIC
-
#define ap_bgetc(fb) ( ((fb)-incnt == 0) ? ap_bfilbuf(fb) : \
((fb)-incnt--, *((fb)-inptr++)) )
#define ap_bputc(c, fb) fb)-flags (B_EOUT|B_WRERR|B_WR)) != B_WR || \
(fb)-outcnt == (fb)-bufsiz) ? ap_bflsbuf(c, (fb)) : \
((fb)-outbase[(fb)-outcnt++] = (c), 0))
-
-#else /*CHARSET_EBCDIC*/
-
-#define ap_bgetc(fb) ( ((fb)-incnt == 0) ? ap_bfilbuf(fb) : \
- ((fb)-incnt--, (fb-flags B_ASCII2EBCDIC)\
- ?os_toebcdic[(unsigned
char)*((fb)-inptr++)]:*((fb)-inptr++)) )
-
-#define ap_bputc(c, fb) fb)-flags (B_EOUT|B_WRERR|B_WR)) != B_WR || \
- (fb)-outcnt == (fb)-bufsiz) ? ap_bflsbuf(c, (fb)) : \
- ((fb)-outbase[(fb)-outcnt++] = (fb-flags
B_EBCDIC2ASCII)\
- ?os_toascii[(unsigned char)c]:(c), 0))
-#endif /*CHARSET_EBCDIC*/
+/* XXX: this doesn't belong here... should be part of a generic spawning API
in APR/NSPR */
struct child_info {
#ifdef WIN32
/*
1.2 +11 -417 apache-2.0/mpm/src/main/buff.c
Index: buff.c
===
RCS file: /home/cvs/apache-2.0/mpm/src/main/buff.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- buff.c1999/06/18 18:39:29 1.1
+++ buff.c1999/06/18 19:20:48 1.2
@@ -75,12 +75,6 @@
#ifndef DEFAULT_BUFSIZE
#define DEFAULT_BUFSIZE (4096)
#endif
-/* This must be enough to represent (DEFAULT_BUFSIZE - 3) in hex,
- * plus two extra characters.
- */
-#ifndef CHUNK_HEADER_SIZE
-#define CHUNK_HEADER_SIZE (5)
-#endif
/* bwrite()s of greater than this size can result in a large_write() call,
@@ -219,37 +213,21 @@
else
fb-inbase = NULL
cvs commit: apache-apr/pthreads/src/test/rename apapi.h
dgaudet 99/06/09 15:03:44
Modified:pthreads/src/include buff.h
pthreads/src/main alloc.c buff.c http_main.c
pthreads/src/modules/proxy proxy_cache.c proxy_ftp.c
proxy_http.c
pthreads/src/test/rename apapi.h
Log:
get rid of fd_in, it's not needed by anything anymore
Revision ChangesPath
1.6 +1 -2 apache-apr/pthreads/src/include/buff.h
Index: buff.h
===
RCS file: /home/cvs/apache-apr/pthreads/src/include/buff.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- buff.h1999/06/03 23:46:21 1.5
+++ buff.h1999/06/09 22:03:38 1.6
@@ -116,7 +116,6 @@
/* could also put pointers to the basic I/O routines here */
int fd; /* the file descriptor */
-int fd_in; /* input file descriptor, if different
*/
#ifdef WIN32
HANDLE hFH; /* Windows filehandle */
#endif
@@ -145,7 +144,7 @@
/* Stream creation and modification */
API_EXPORT(BUFF *) ap_bcreate(pool *p, int flags);
-API_EXPORT(void) ap_bpushfd(BUFF *fb, int fd_in, int fd_out);
+API_EXPORT(void) ap_bpushfd(BUFF *fb, int fd);
/* XXX - unused right now - mvsk */
API_EXPORT(BUFF *) ap_bopenf(pool *a, const char *name, int flg, int mode);
1.7 +3 -3 apache-apr/pthreads/src/main/alloc.c
Index: alloc.c
===
RCS file: /home/cvs/apache-apr/pthreads/src/main/alloc.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- alloc.c 1999/05/30 23:48:58 1.6
+++ alloc.c 1999/06/09 22:03:39 1.7
@@ -2452,19 +2452,19 @@
if (pipe_out) {
*pipe_out = ap_bcreate(p, B_RD);
ap_note_cleanups_for_fd(p, fd_out);
- ap_bpushfd(*pipe_out, fd_out, fd_out);
+ ap_bpushfd(*pipe_out, fd_out);
}
if (pipe_in) {
*pipe_in = ap_bcreate(p, B_WR);
ap_note_cleanups_for_fd(p, fd_in);
- ap_bpushfd(*pipe_in, fd_in, fd_in);
+ ap_bpushfd(*pipe_in, fd_in);
}
if (pipe_err) {
*pipe_err = ap_bcreate(p, B_RD);
ap_note_cleanups_for_fd(p, fd_err);
- ap_bpushfd(*pipe_err, fd_err, fd_err);
+ ap_bpushfd(*pipe_err, fd_err);
}
#endif
1.12 +10 -22apache-apr/pthreads/src/main/buff.c
Index: buff.c
===
RCS file: /home/cvs/apache-apr/pthreads/src/main/buff.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- buff.c1999/06/03 23:46:22 1.11
+++ buff.c1999/06/09 22:03:39 1.12
@@ -239,7 +239,6 @@
fb-bytes_sent = 0;
fb-fd = -1;
-fb-fd_in = -1;
fb-timeout = -1;
#ifdef B_SFIO
@@ -257,10 +256,9 @@
/*
* Push some I/O file descriptors onto the stream
*/
-API_EXPORT(void) ap_bpushfd(BUFF *fb, APRFile fd_in, APRFile fd_out)
+API_EXPORT(void) ap_bpushfd(BUFF *fb, APRFile fd)
{
-fb-fd = fd_out;
-fb-fd_in = fd_in;
+fb-fd = fd;
}
API_EXPORT(int) ap_bsetopt(BUFF *fb, int optname, const void *optval)
@@ -445,7 +443,7 @@
API_EXPORT(int) ap_bfileno(BUFF *fb, int direction)
{
-return (direction == B_RD) ? fb-fd_in : fb-fd;
+return fb-fd;
}
/*
@@ -469,7 +467,7 @@
/* Test the descriptor and flush the output buffer if it looks like
* we will block on the next read.
*
- * Note we assume the caller has ensured that fb-fd_in = FD_SETSIZE
+ * Note we assume the caller has ensured that fb-fd = FD_SETSIZE
*/
API_EXPORT(void) ap_bhalfduplex(BUFF *fb)
{
@@ -481,16 +479,16 @@
* or there is something readable in the incoming buffer
* or there is nothing flushable in the output buffer.
*/
-if (fb == NULL || fb-fd_in 0 || fb-incnt 0 || fb-outcnt == 0) {
+if (fb == NULL || fb-fd 0 || fb-incnt 0 || fb-outcnt == 0) {
return;
}
/* test for a block */
do {
FD_ZERO(fds);
- FD_SET(fb-fd_in, fds);
+ FD_SET(fb-fd, fds);
tv.tv_sec = 0;
tv.tv_usec = 0;
- rv = ap_select(fb-fd_in + 1, fds, NULL, NULL, tv);
+ rv = ap_select(fb-fd + 1, fds, NULL, NULL, tv);
} while (rv 0 errno == EINTR !(fb-flags B_EOUT));
/* treat any error as if it would block as well */
@@ -507,7 +505,7 @@
ap_bhalfduplex(fb);
}
do {
- rv = recvwithtimeout(fb-fd_in, buf, nbyte, fb-timeout);
+ rv = recvwithtimeout(fb-fd, buf, nbyte, fb-timeout);
} while (rv == -1 errno == EINTR !(fb-flags B_EOUT));
return (rv);
}
@@ -1309,12 +1307,6 @@
else
rc1 = 0;
rc2 = ap_pclosef(fb-pool, fb-fd);
-if (fb
cvs commit: apache-apr/pthreads/src/include buff.h httpd.h
dgaudet 99/06/09 15:06:30 Modified:pthreads/src/include buff.h httpd.h Log: BO_TIMEOUT belongs in buff.h Revision ChangesPath 1.7 +1 -0 apache-apr/pthreads/src/include/buff.h Index: buff.h === RCS file: /home/cvs/apache-apr/pthreads/src/include/buff.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- buff.h1999/06/09 22:03:38 1.6 +++ buff.h1999/06/09 22:06:29 1.7 @@ -141,6 +141,7 @@ /* Options to bset/getopt */ #define BO_BYTECT (1) +#define BO_TIMEOUT (2) /* Stream creation and modification */ API_EXPORT(BUFF *) ap_bcreate(pool *p, int flags); 1.16 +0 -2 apache-apr/pthreads/src/include/httpd.h Index: httpd.h === RCS file: /home/cvs/apache-apr/pthreads/src/include/httpd.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- httpd.h 1999/05/24 06:53:32 1.15 +++ httpd.h 1999/06/09 22:06:29 1.16 @@ -1141,8 +1141,6 @@ #endif #define strtoul strtoul_is_not_a_portable_function_use_strtol_instead -#define BO_TIMEOUT 2 - #define ap_is_aborted(abort) (abort-aborted ==1) #ifdef __cplusplus
cvs commit: apache-1.3 STATUS
dgaudet 99/06/04 09:49:14 Modified:.STATUS Log: a sunny day here Revision ChangesPath 1.698 +5 -15 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.697 retrieving revision 1.698 diff -u -r1.697 -r1.698 --- STATUS1999/06/04 16:37:58 1.697 +++ STATUS1999/06/04 16:49:10 1.698 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/06/04 16:37:58 $] + Last modified at [$Date: 1999/06/04 16:49:10 $] Release: @@ -95,7 +95,7 @@ * Ralf's [PATCH] to add EAPI (ctx, hook, mm, etc.) to the base package Message-ID: [EMAIL PROTECTED] - Status: Jim +1, Mark +1, Dean -0, BenH +1 + Status: Jim +1, Mark +1, Dean +1, BenH +1 * Tony Finch's patch to support mass virtual hosting Message-ID: [EMAIL PROTECTED] @@ -115,11 +115,11 @@ * Aidan Cully's patch to allow assignment of 'ownership' of resources to either the server UID or the file's owner. Message-ID: [EMAIL PROTECTED] - Status: Ken +1 + Status: Ken +1, Dean +1 * John Giannadrea's patch for ceiling on file size for mmap (PR#4122) Message-ID: [EMAIL PROTECTED] - Status: Ken +1 + Status: Ken +1, Dean +1 * Keith Wannamaker's NT multiple services patch Message-ID: [EMAIL PROTECTED] @@ -175,6 +175,7 @@ please review the shared memory deep-level code. Doug: +1 on concept (untested) Lars: +1 on concept + Dean: isn't this superceded by EAPI? * Mark Bixby's freshening up the MPE/iX port (mostly APACI) Message-ID: [EMAIL PROTECTED] @@ -251,17 +252,6 @@ * general/3787: SERVER_PORT is always 80 if client comes to any port = needs review by the protocol guys, I think. - -* Someone other than Dean has to do a security/correctness review on - psprintf(), bprintf(), and ap_snprintf(). In particular these routines - do lots of fun pointer manipulations and such and possibly have overflow - errors. The respective flush_funcs also need to be exercised. - o Jim's looked over the ap_snprintf() stuff (the changes that Dean - did to make thread-safe) and they look fine. - o Laura La Gassa's looked over ap_vformatter other related code - o Martin did a source review as well. - o Could still use 1 or 2 more sets of eyeballs. - Status: Is this still valid?? * Paul would like to see a 'gdbm' option because he uses it a lot.
cvs commit: apache-1.3 STATUS
dgaudet 99/06/04 10:00:27 Modified:.STATUS Log: still sunny Revision ChangesPath 1.699 +6 -2 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.698 retrieving revision 1.699 diff -u -r1.698 -r1.699 --- STATUS1999/06/04 16:49:10 1.698 +++ STATUS1999/06/04 17:00:25 1.699 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/06/04 16:49:10 $] + Last modified at [$Date: 1999/06/04 17:00:25 $] Release: @@ -69,7 +69,11 @@ libraries are detected, but the ndbm include file was moved to /usr/include/db1 Status: Ralf is looking at it - + +- graham legget has found that if he uses the 1.3.7-dev core, and + the 1.3.6 proxy code (plus a small patch of his) he doesn't get + the hangs he was reporting. Something is broken in the 1.3.7-dev + proxy. RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
cvs commit: apache-1.3/src/modules/standard mod_negotiation.c
dgaudet 99/06/04 10:15:53
Modified:htdocs/manual content-negotiation.html
src CHANGES
src/modules/standard mod_negotiation.c
Log:
This patch removes the processing of `mxb' parameters in Accept
headers in mod_negotiation. A second patch updates the manual to
reflect this (mxb is not documented directly in the manual but support
for it is implied in one place).
Reasons for removing this feature:
1) As currently implemented, the 'mxb' feature makes possible certain
denial-of-service attacks on negotiated content. These attacks are
posssible for user communities which access an Apache server from
behind a HTTP/1.1 proxy which implements `Vary' related optimisations.
Plugging this denial of service hole without removing `mxb' is fairly
expensive in terms of degrading caching efficiency.
2) `mxb' is not in HTTP/1.0 or HTTP/1.1 or any other standard
3) Nobody seems to make use of 'mxb'. (Balachander Krishnamurthy
kindly offered to grep some of his web traffic traces -- he did not
find a single Accept with mxb in a whole day of recent traffic, nor in
older traces)
4) Removing a feature makes a nice change from adding features.
Submitted by: Koen Holtman [EMAIL PROTECTED]
Revision ChangesPath
1.22 +3 -4 apache-1.3/htdocs/manual/content-negotiation.html
Index: content-negotiation.html
===
RCS file: /home/cvs/apache-1.3/htdocs/manual/content-negotiation.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- content-negotiation.html 1999/03/19 21:23:19 1.21
+++ content-negotiation.html 1999/06/04 17:15:48 1.22
@@ -196,10 +196,9 @@
for compress'd files, and CODEx-gzip/CODE for gzip'd files.
The CODEx-/CODE prefix is ignored for encoding comparisons.
DT CODEContent-Length:/CODE
- DD The size of the file. Clients can ask to receive a given media
- type only if the variant isn't too big; specifying a content
- length in the map allows the server to compare against these
- thresholds without checking the actual file.
+ DD The size of the file. Specifying content
+ lengths in the type-map allows the server to compare file sizes
+ without checking the actual files.
DT CODEDescription:/CODE
DD A human-readable textual description of the variant. If Apache cannot
find any appropriate variant to return, it will return an error
1.1369+4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1368
retrieving revision 1.1369
diff -u -r1.1368 -r1.1369
--- CHANGES 1999/06/04 00:21:36 1.1368
+++ CHANGES 1999/06/04 17:15:49 1.1369
@@ -1,5 +1,9 @@
Changes with Apache 1.3.7
+ *) Remove mxb support from mod_negotiation -- it was a draft feature
+ never accepted into any standard, and it opens up certain DoS
+ attacks. [Koen Holtman [EMAIL PROTECTED]]
+
*) The source is now quad (long long) aware as needed. Specifically,
the Configure process determines the correct size of off_t and
*void. When the OS/platform/compiler supports quads, ap_snprintf()
1.99 +0 -23 apache-1.3/src/modules/standard/mod_negotiation.c
Index: mod_negotiation.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_negotiation.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- mod_negotiation.c 1999/03/19 21:23:24 1.98
+++ mod_negotiation.c 1999/06/04 17:15:51 1.99
@@ -140,7 +140,6 @@
typedef struct accept_rec {
char *name; /* MUST be lowercase */
float quality;
-float max_bytes;
float level;
char *charset; /* for content-type only */
} accept_rec;
@@ -315,7 +314,6 @@
const char *accept_line)
{
result-quality = 1.0f;
-result-max_bytes = 0.0f;
result-level = 0.0f;
result-charset = ;
@@ -392,10 +390,6 @@
(parm[1] == '\0' || (parm[1] == 's' parm[2] == '\0'))) {
result-quality = atof(cp);
}
-else if (parm[0] == 'm' parm[1] == 'x'
- parm[2] == 'b' parm[3] == '\0') {
-result-max_bytes = atof(cp);
-}
else if (parm[0] == 'l' !strcmp(parm[1], evel)) {
result-level = atof(cp);
}
@@ -613,7 +607,6 @@
new_accept-name = */*;
new_accept-quality = 1.0f;
new_accept-level = 0.0f;
-new_accept-max_bytes = 0.0f;
}
new_accept = (accept_rec
cvs commit: apache-1.3/src/main http_main.c
dgaudet 99/06/01 23:30:07
Modified:src CHANGES
src/main http_main.c
Log:
Piped error logs could cause a segfault if an error occured
during configuration after a restart.
PR: 4456
Submitted by: Aidan Cully [EMAIL PROTECTED]
Revision ChangesPath
1.1364+4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1363
retrieving revision 1.1364
diff -u -r1.1363 -r1.1364
--- CHANGES 1999/05/26 18:27:43 1.1363
+++ CHANGES 1999/06/02 06:30:03 1.1364
@@ -1,5 +1,9 @@
Changes with Apache 1.3.7
+ *) Piped error logs could cause a segfault if an error occured
+ during configuration after a restart.
+ [Aidan Cully [EMAIL PROTECTED]] PR#4456
+
*) If a Location field was stored in r-err_headers_out rather
than r-headers_out, redirect processing wouldn't find it and
the server would core dump on ap_escape_html(NULL).
1.440 +13 -7 apache-1.3/src/main/http_main.c
Index: http_main.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.439
retrieving revision 1.440
diff -u -r1.439 -r1.440
--- http_main.c 1999/05/25 11:49:46 1.439
+++ http_main.c 1999/06/02 06:30:05 1.440
@@ -333,7 +333,9 @@
static other_child_rec *other_children;
#endif
+static pool *pglobal;/* Global pool */
static pool *pconf; /* Pool for config stuff */
+static pool *plog; /* Pool for error-logging files */
static pool *ptrans; /* Pool for per-transaction stuff */
static pool *pchild; /* Pool for httpd child stuff */
static pool *pcommands; /* Pool for -C and -c switches */
@@ -2104,7 +2106,7 @@
static void clean_parent_exit(int code)
{
/* Clear the pool - including any registered cleanups */
-ap_destroy_pool(pconf);
+ap_destroy_pool(pglobal);
exit(code);
}
@@ -3579,7 +3581,9 @@
AMCSocketInitialize();
#endif /* WIN32 */
-pconf = ap_init_alloc();
+pglobal = ap_init_alloc();
+pconf = ap_make_sub_pool(pglobal);
+plog = ap_make_sub_pool(pglobal);
ptrans = ap_make_sub_pool(pconf);
ap_util_init();
@@ -4415,7 +4419,8 @@
server_conf = ap_read_config(pconf, ptrans, ap_server_confname);
setup_listeners(pconf);
- ap_open_logs(server_conf, pconf);
+ ap_clear_pool(plog);
+ ap_open_logs(server_conf, plog);
ap_log_pid(pconf, ap_pid_fname);
ap_set_version(); /* create our server_version string */
ap_init_modules(pconf, server_conf);
@@ -4762,7 +4767,7 @@
#ifndef TPF
if (ap_standalone) {
- ap_open_logs(server_conf, pconf);
+ ap_open_logs(server_conf, plog);
ap_set_version();
ap_init_modules(pconf, server_conf);
version_locked++;
@@ -4805,7 +4810,7 @@
/* Yes this is called twice. */
ap_init_modules(pconf, server_conf);
version_locked++;
- ap_open_logs(server_conf, pconf);
+ ap_open_logs(server_conf, plog);
ap_init_modules(pconf, server_conf);
set_group_privs();
@@ -5855,7 +5860,8 @@
pparent = ap_make_sub_pool(pconf);
server_conf = ap_read_config(pconf, pparent, ap_server_confname);
- ap_open_logs(server_conf, pconf);
+ ap_clear_pool(plog);
+ ap_open_logs(server_conf, plog);
ap_set_version();
ap_init_modules(pconf, server_conf);
version_locked++;
@@ -6093,7 +6099,7 @@
ap_init_modules(pconf, server_conf);
ap_suexec_enabled = init_suexec();
version_locked++;
-ap_open_logs(server_conf, pconf);
+ap_open_logs(server_conf, plog);
set_group_privs();
}
cvs commit: apache-1.3/src/modules/proxy proxy_cache.c
dgaudet 99/06/02 11:10:11
Modified:src/modules/proxy proxy_cache.c
Log:
missing ap_unblock_alarms
Revision ChangesPath
1.60 +0 -1 apache-1.3/src/modules/proxy/proxy_cache.c
Index: proxy_cache.c
===
RCS file: /home/cvs/apache-1.3/src/modules/proxy/proxy_cache.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- proxy_cache.c 1999/04/22 14:27:51 1.59
+++ proxy_cache.c 1999/06/02 18:10:09 1.60
@@ -327,7 +327,6 @@
else {
lastcheck = buf.st_mtime; /* save the time */
if (garbage_now lastcheck + every) {
-ap_unblock_alarms();
return 0;
}
if (utime(filename, NULL) == -1)
Re: mod_log-any/4366: mod_log_config can log month in local language
[In order for any reply to be added to the PR database, ]
[you need to include [EMAIL PROTECTED] in the Cc line ]
[and leave the subject line UNCHANGED. This is not done]
[automatically because of the potential for mail loops. ]
[If you do not include this Cc, your reply may be ig- ]
[nored unless you are responding to an explicit request ]
[from a developer. ]
[Reply only with text; DO NOT SEND ATTACHMENTS! ]
Synopsis: mod_log_config can log month in local language
State-Changed-From-To: open-closed
State-Changed-By: dgaudet
State-Changed-When: Sun May 16 16:40:34 PDT 1999
State-Changed-Why:
patch from petr lampa applied to 1.3.7-dev... makes %t
always use english, but %{format}t still uses strftime()
cvs commit: apache-1.3/src/modules/standard mod_include.c mod_autoindex.c
dgaudet 99/05/13 12:00:48
Modified:src/modules/standard mod_include.c mod_autoindex.c
Log:
Back out the evil hack portion of Raymond's patch. In addition to being
an evil hack, it causes memory corruption. You cannot destroy a #included
subrequest of mod_include... look for all uses of request_config in
mod_include, in particular look at the code around the ap_join_pool call.
Revision ChangesPath
1.116 +9 -40 apache-1.3/src/modules/standard/mod_include.c
Index: mod_include.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_include.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- mod_include.c 1999/05/13 18:25:57 1.115
+++ mod_include.c 1999/05/13 19:00:41 1.116
@@ -108,6 +108,9 @@
module MODULE_VAR_EXPORT includes_module;
+/* just need some arbitrary non-NULL pointer which can't also be a
request_rec */
+#define NESTED_INCLUDE_MAGIC (includes_module)
+
/* Environment function --
*/
/* XXX: could use ap_table_overlap here */
@@ -743,7 +746,9 @@
}
/* destroy the sub request if it's not a nested include */
- if (rr != NULL) {
+if (rr != NULL
+ ap_get_module_config(rr-request_config, includes_module)
+ != NESTED_INCLUDE_MAGIC) {
ap_destroy_sub_req(rr);
}
}
@@ -2371,41 +2376,6 @@
return OK;
}
-#define SUB_REQ_STRING Sub request to mod_include
-#define PARENT_STRINGParent request to mod_include
-
-if (ap_table_get(r-notes, SUB_REQ_STRING) != NULL) {
- request_rec *p = r-main;
-
- /*
- * The note is a flag to mod_include that this request is actually
- * a subrequest from another module and that mod_include needs to
- * treat it as if it's a subrequest from mod_include.
- *
- * HACK ALERT!
- * There is no good way to pass the parent request_rec to mod_include.
- * Tables only take string values and there is nowhere appropriate in
- * in the request_rec that can safely be used.
- *
- * So we search up the chain of requests and redirects looking for
- * the parent request.
- */
-
- while (p) {
- if (ap_table_get(p-notes, PARENT_STRING) != NULL) {
- /* Kludge --- See below */
- ap_set_module_config(r-request_config, includes_module, p);
-
- ap_add_common_vars(p);
- ap_add_cgi_vars(p);
- add_include_vars(p, DEFAULT_TIME_FORMAT);
- ap_table_unset(r-notes, SUB_REQ_STRING);
- break;
- }
- p = (p-prev) ? p-prev : p-main;
- }
-}
-
if ((parent = ap_get_module_config(r-request_config,
includes_module))) {
/* Kludge --- for nested includes, we want to keep the subprocess
* environment of the base document (for compatibility); that means
@@ -2441,10 +2411,9 @@
send_parsed_content(f, r);
if (parent) {
- /* Kludge --- Doing this allows the caller to safely destroy the
- * sub_req
- */
- r-pool = ap_make_sub_pool(r-pool);
+ /* signify that the sub request should not be killed */
+ ap_set_module_config(r-request_config, includes_module,
+ NESTED_INCLUDE_MAGIC);
}
ap_kill_timeout(r);
1.108 +0 -8 apache-1.3/src/modules/standard/mod_autoindex.c
Index: mod_autoindex.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_autoindex.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- mod_autoindex.c 1999/05/13 18:25:56 1.107
+++ mod_autoindex.c 1999/05/13 19:00:43 1.108
@@ -924,10 +924,6 @@
ap_rputs(/PRE\n, r);
}
-/* See mod_include */
-#define SUB_REQ_STRING Sub request to mod_include
-#define PARENT_STRINGParent request to mod_include
-
/*
* Handle the preamble through the H1 tag line, inclusive. Locate
* the file with a subrequests. Process text/html documents by actually
@@ -969,8 +965,6 @@
if (! suppress_amble) {
emit_preamble(r, title);
}
- ap_table_add(r-notes, PARENT_STRING, );
- ap_table_add(rr-notes, SUB_REQ_STRING, );
/*
* If there's a problem running the subrequest, display the
* preamble if we didn't do it before -- the header file
@@ -1045,8 +1039,6 @@
*/
if (rr-content_type != NULL) {
if (!strcasecmp(text/html, rr-content_type)) {
- ap_table_add(r
cvs commit: apache-1.3/src/include alloc.h
dgaudet 99/05/13 12:44:15 Modified:src/include alloc.h Log: add a bunch more info to the pool/ancestor documentation... Raymond's comments made it clear to me that what I'd written wasn't so clear ;) Revision ChangesPath 1.68 +36 -2 apache-1.3/src/include/alloc.h Index: alloc.h === RCS file: /home/cvs/apache-1.3/src/include/alloc.h,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- alloc.h 1999/03/07 14:05:33 1.67 +++ alloc.h 1999/05/13 19:44:14 1.68 @@ -95,8 +95,42 @@ API_EXPORT(pool *) ap_make_sub_pool(pool *); /* All pools are subpools of permanent_pool */ API_EXPORT(void) ap_destroy_pool(pool *); -/* used to guarantee to the pool debugging code that the sub pool will not be - * destroyed before the parent pool +/* pools have nested lifetimes -- sub_pools are destroyed when the + * parent pool is cleared. We allow certain liberties with operations + * on things such as tables (and on other structures in a more general + * sense) where we allow the caller to insert values into a table which + * were not allocated from the table's pool. The table's data will + * remain valid as long as all the pools from which its values are + * allocated remain valid. + * + * For example, if B is a sub pool of A, and you build a table T in + * pool B, then it's safe to insert data allocated in A or B into T + * (because B lives at most as long as A does, and T is destroyed when + * B is cleared/destroyed). On the other hand, if S is a table in + * pool A, it is safe to insert data allocated in A into S, but it + * is *not safe* to insert data allocated from B into S... because + * B can be cleared/destroyed before A is (which would leave dangling + * pointers in T's data structures). + * + * In general we say that it is safe to insert data into a table T + * if the data is allocated in any ancestor of T's pool. This is the + * basis on which the POOL_DEBUG code works -- it tests these ancestor + * relationships for all data inserted into tables. POOL_DEBUG also + * provides tools (ap_find_pool, and ap_pool_is_ancestor) for other + * folks to implement similar restrictions for their own data + * structures. + * + * However, sometimes this ancestor requirement is inconvenient -- + * sometimes we're forced to create a sub pool (such as through + * ap_sub_req_lookup_uri), and the sub pool is guaranteed to have + * the same lifetime as the parent pool. This is a guarantee implemented + * by the *caller*, not by the pool code. That is, the caller guarantees + * they won't destroy the sub pool individually prior to destroying the + * parent pool. + * + * In this case the caller must call ap_pool_join() to indicate this + * guarantee to the POOL_DEBUG code. There are a few examples spread + * through the standard modules. */ #ifndef POOL_DEBUG #ifdef ap_pool_join
cvs commit: apache-1.3/src/main http_request.c
dgaudet 99/05/12 09:50:43
Modified:src CHANGES
src/main http_request.c
Log:
don't assume the struct stat passed to stat() is left alone when the
stat fails
Submitted by: Ed Korthof [EMAIL PROTECTED]
Revision ChangesPath
1.1353+3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1352
retrieving revision 1.1353
diff -u -r1.1352 -r1.1353
--- CHANGES 1999/05/07 00:38:05 1.1352
+++ CHANGES 1999/05/12 16:50:40 1.1353
@@ -1,5 +1,8 @@
Changes with Apache 1.3.7
+ *) When stat() fails, don't assume anything about the contents of
+ the struct stat. [Ed Korthof [EMAIL PROTECTED]]
+
*) It's OK for a semop to return EINTR, just loop around and try
again. [Dean Gaudet]
1.148 +10 -8 apache-1.3/src/main/http_request.c
Index: http_request.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_request.c,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- http_request.c1999/04/20 23:38:44 1.147
+++ http_request.c1999/05/12 16:50:42 1.148
@@ -265,8 +265,12 @@
*cp = '\0';
return OK;
}
+ /* must set this to zero, some stat()s may have corrupted it
+ * even if they returned an error.
+ */
+ r-finfo.st_mode = 0;
#if defined(ENOENT) defined(ENOTDIR)
-else if (errno == ENOENT || errno == ENOTDIR) {
+if (errno == ENOENT || errno == ENOTDIR) {
last_cp = cp;
while (--cp path *cp != '/')
@@ -299,15 +303,13 @@
* you needed to do this. Please be sure to include the operating
* system you are using.
*/
-else {
-last_cp = cp;
+ last_cp = cp;
-while (--cp path *cp != '/')
-continue;
+ while (--cp path *cp != '/')
+ continue;
-while (cp path cp[-1] == '/')
---cp;
-}
+ while (cp path cp[-1] == '/')
+ --cp;
#endif /* ENOENT ENOTDIR */
}
return OK;
cvs commit: apache-1.3/src/main http_main.c
dgaudet 99/05/06 17:38:13
Modified:src CHANGES
src/main http_main.c
Log:
loop around on EINTR from semop()
Revision ChangesPath
1.1352+3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1351
retrieving revision 1.1352
diff -u -r1.1351 -r1.1352
--- CHANGES 1999/05/07 00:16:06 1.1351
+++ CHANGES 1999/05/07 00:38:05 1.1352
@@ -1,5 +1,8 @@
Changes with Apache 1.3.7
+ *) It's OK for a semop to return EINTR, just loop around and try
+ again. [Dean Gaudet]
+
*) Fix configuration engine re-entrant hangups, which solve a
handful of problems seen with mod_perl Perl configuration sections
[Salvador Ortiz Garcia [EMAIL PROTECTED]]
1.436 +10 -6 apache-1.3/src/main/http_main.c
Index: http_main.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.435
retrieving revision 1.436
diff -u -r1.435 -r1.436
--- http_main.c 1999/05/05 20:42:58 1.435
+++ http_main.c 1999/05/07 00:38:11 1.436
@@ -741,17 +741,21 @@
static void accept_mutex_on(void)
{
-if (semop(sem_id, op_on, 1) 0) {
- perror(accept_mutex_on);
- clean_child_exit(APEXIT_CHILDFATAL);
+while (semop(sem_id, op_on, 1) 0) {
+ if (errno != EINTR) {
+ perror(accept_mutex_on);
+ clean_child_exit(APEXIT_CHILDFATAL);
+ }
}
}
static void accept_mutex_off(void)
{
-if (semop(sem_id, op_off, 1) 0) {
- perror(accept_mutex_off);
- clean_child_exit(APEXIT_CHILDFATAL);
+while (semop(sem_id, op_off, 1) 0) {
+ if (errno != EINTR) {
+ perror(accept_mutex_off);
+ clean_child_exit(APEXIT_CHILDFATAL);
+ }
}
}
cvs commit: apache-1.3/src/modules/standard mod_include.c
dgaudet 99/05/05 10:46:08
Modified:src CHANGES
src/modules/standard mod_include.c
Log:
mod_include's fsize/flastmod should allow only relative paths, just
like include file.
This bug was introduced during the 1.98 - 1.99 rev of mod_include.
Submitted by: Jaroslav Benkovsky [EMAIL PROTECTED]
Revision ChangesPath
1.1347+3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1346
retrieving revision 1.1347
diff -u -r1.1346 -r1.1347
--- CHANGES 1999/05/04 11:21:07 1.1346
+++ CHANGES 1999/05/05 17:46:05 1.1347
@@ -1,5 +1,8 @@
Changes with Apache 1.3.7
+ *) mod_include's fsize/flastmod should allow only relative paths, just
+ like include file. [Jaroslav Benkovsky [EMAIL PROTECTED]]
+
*) OS/2: Add support for building loadable modules using DLLs.
[Brian Havard]
1.114 +26 -20apache-1.3/src/modules/standard/mod_include.c
Index: mod_include.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_include.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- mod_include.c 1999/04/27 20:36:35 1.113
+++ mod_include.c 1999/05/05 17:46:07 1.114
@@ -1045,35 +1045,41 @@
static int find_file(request_rec *r, const char *directive, const char *tag,
char *tag_val, struct stat *finfo, const char *error)
{
-char *to_send;
-request_rec *rr;
+char *to_send = tag_val;
+request_rec *rr = NULL;
int ret=0;
+char *error_fmt = NULL;
if (!strcmp(tag, file)) {
-ap_getparents(tag_val);/* get rid of any nasties */
-
-rr = ap_sub_req_lookup_file(tag_val, r);
+/* be safe; only files in this directory or below allowed */
+if (!is_only_below(tag_val)) {
+error_fmt = unable to access file \%s\
+in parsed file %s;
+}
+else {
+ap_getparents(tag_val);/* get rid of any nasties */
+rr = ap_sub_req_lookup_file(tag_val, r);
-if (rr-status == HTTP_OK rr-finfo.st_mode != 0) {
-to_send = rr-filename;
-if ((ret = stat(to_send, finfo)) == -1) {
-ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
-unable to get information about \%s\
-in parsed file %s,
-to_send, r-filename);
-ap_rputs(error, r);
+if (rr-status == HTTP_OK rr-finfo.st_mode != 0) {
+to_send = rr-filename;
+if (stat(to_send, finfo)) {
+error_fmt = unable to get information about \%s\
+in parsed file %s;
+}
+}
+else {
+error_fmt = unable to lookup information about \%s\
+in parsed file %s;
}
}
-else {
+
+if (error_fmt) {
ret = -1;
-ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
-unable to lookup information about \%s\
-in parsed file %s,
-tag_val, r-filename);
+ap_log_rerror(APLOG_MARK, APLOG_ERR, r, error_fmt, to_send,
r-filename);
ap_rputs(error, r);
}
-
-ap_destroy_sub_req(rr);
+
+if (rr) ap_destroy_sub_req(rr);
return ret;
}
Re: os-linux/2774: Heavily loaded webserver stops accepting all connections after some time.
[In order for any reply to be added to the PR database, ] [you need to include [EMAIL PROTECTED] in the Cc line ] [and leave the subject line UNCHANGED. This is not done] [automatically because of the potential for mail loops. ] [If you do not include this Cc, your reply may be ig- ] [nored unless you are responding to an explicit request ] [from a developer. ] [Reply only with text; DO NOT SEND ATTACHMENTS! ] Synopsis: Heavily loaded webserver stops accepting all connections after some time. State-Changed-From-To: feedback-closed State-Changed-By: dgaudet State-Changed-When: Tue May 4 11:23:32 PDT 1999 State-Changed-Why: user reports problem resolved (info forwarded to bugdb) thanks!
Re: os-linux/3387: Regularly the httpd children will all die with no errors given, the root process will still be running, must stop and restart httpd.
[In order for any reply to be added to the PR database, ] [you need to include [EMAIL PROTECTED] in the Cc line ] [and leave the subject line UNCHANGED. This is not done] [automatically because of the potential for mail loops. ] [If you do not include this Cc, your reply may be ig- ] [nored unless you are responding to an explicit request ] [from a developer. ] [Reply only with text; DO NOT SEND ATTACHMENTS! ] Synopsis: Regularly the httpd children will all die with no errors given, the root process will still be running, must stop and restart httpd. State-Changed-From-To: feedback-closed State-Changed-By: dgaudet State-Changed-When: Mon May 3 12:40:47 PDT 1999 State-Changed-Why: User reports upgrading kernel fixed the problem. Thanks!
Re: os-linux/2986: after log rotation restart, all children die in hours. Parent is catatonic.
[In order for any reply to be added to the PR database, ] [you need to include [EMAIL PROTECTED] in the Cc line ] [and leave the subject line UNCHANGED. This is not done] [automatically because of the potential for mail loops. ] [If you do not include this Cc, your reply may be ig- ] [nored unless you are responding to an explicit request ] [from a developer. ] [Reply only with text; DO NOT SEND ATTACHMENTS! ] Synopsis: after log rotation restart, all children die in hours. Parent is catatonic. State-Changed-From-To: analyzed-closed State-Changed-By: dgaudet State-Changed-When: Mon May 3 12:41:58 PDT 1999 State-Changed-Why: Another user has reported upgrading to linux 2.0.36 and apache 1.3.6 fixed a very similar problem. If you continue to experience this problem after upgrading, please open a new report. Thanks Dean
Re: mod_proxy/3178: Access Violation/SEGV in ap_proxy_cache_error
[In order for any reply to be added to the PR database, ] [you need to include [EMAIL PROTECTED] in the Cc line ] [and leave the subject line UNCHANGED. This is not done] [automatically because of the potential for mail loops. ] [If you do not include this Cc, your reply may be ig- ] [nored unless you are responding to an explicit request ] [from a developer. ] [Reply only with text; DO NOT SEND ATTACHMENTS! ] Synopsis: Access Violation/SEGV in ap_proxy_cache_error State-Changed-From-To: open-closed State-Changed-By: dgaudet State-Changed-When: Sat May 1 10:03:48 PDT 1999 State-Changed-Why: A patch has been committed to 1.3.7, thanks.
Re: config/3661: 'make install' ignores the --prefix dir specified during configuration
[In order for any reply to be added to the PR database, ] [you need to include [EMAIL PROTECTED] in the Cc line ] [and leave the subject line UNCHANGED. This is not done] [automatically because of the potential for mail loops. ] [If you do not include this Cc, your reply may be ig- ] [nored unless you are responding to an explicit request ] [from a developer. ] [Reply only with text; DO NOT SEND ATTACHMENTS! ] Synopsis: 'make install' ignores the --prefix dir specified during configuration State-Changed-From-To: feedback-closed State-Changed-By: dgaudet State-Changed-When: Sat May 1 10:16:59 PDT 1999 State-Changed-Why: User reports the problem is fixed in 1.3.6.
Re: config/3714: Make returns a elf error message
[In order for any reply to be added to the PR database, ] [you need to include [EMAIL PROTECTED] in the Cc line ] [and leave the subject line UNCHANGED. This is not done] [automatically because of the potential for mail loops. ] [If you do not include this Cc, your reply may be ig- ] [nored unless you are responding to an explicit request ] [from a developer. ] [Reply only with text; DO NOT SEND ATTACHMENTS! ] Synopsis: Make returns a elf error message State-Changed-From-To: feedback-closed State-Changed-By: dgaudet State-Changed-When: Sat May 1 10:33:28 PDT 1999 State-Changed-Why: user reports gcc misconfiguration
Re: os-linux/3312: Children die. Parent stops serving requests
[In order for any reply to be added to the PR database, ]
[you need to include [EMAIL PROTECTED] in the Cc line ]
[and leave the subject line UNCHANGED. This is not done]
[automatically because of the potential for mail loops. ]
[If you do not include this Cc, your reply may be ig- ]
[nored unless you are responding to an explicit request ]
[from a developer. ]
[Reply only with text; DO NOT SEND ATTACHMENTS! ]
Synopsis: Children die. Parent stops serving requests
State-Changed-From-To: feedback-analyzed
State-Changed-By: dgaudet
State-Changed-When: Sat May 1 10:39:02 PDT 1999
State-Changed-Why:
I examined the straces a while ago, but forgot to comment.
Here's a portion of the parent's trace:
time(NULL) = 909702870
wait4(-1, 0xbe64, WNOHANG, NULL)= 0
select(0, NULL, NULL, NULL, {1, 0}) = 0 (Timeout)
time(NULL) = 909702871
fork() = 26032
wait4(-1, [WIFEXITED(s) WEXITSTATUS(s) == 0], WNOHANG, NULL) = 26032
--- SIGCHLD (Child exited) ---
wait4(-1, 0xbe64, WNOHANG, NULL)= -1 ECHILD (No child processes)
select(0, NULL, NULL, NULL, {1, 0}) = 0 (Timeout)
time(NULL) = 909703113
Somehow 242 seconds passed between the two time() calls... the parent does
nothing cpu intensive, so I doubt it's that. It's possible the guy's box
is swapping to hell... but we've got about a dozen similar reports. The
reports are against 2.0.30, 2.0.32, and 2.0.33.
Oh then there's the odd SIGCHLD followed by ECHILD... there's a few other
instances of that -- SIGCHLDs happenning and wait4() not reporting
anything.
The short answer: kernel problem. Alan Cox hasn't heard of
this problem before, so it's probably an unknown problem.
Dean
Re: os-linux/2986: after log rotation restart, all children die in hours. Parent is catatonic.
[In order for any reply to be added to the PR database, ] [you need to include [EMAIL PROTECTED] in the Cc line ] [and leave the subject line UNCHANGED. This is not done] [automatically because of the potential for mail loops. ] [If you do not include this Cc, your reply may be ig- ] [nored unless you are responding to an explicit request ] [from a developer. ] [Reply only with text; DO NOT SEND ATTACHMENTS! ] Synopsis: after log rotation restart, all children die in hours. Parent is catatonic. State-Changed-From-To: feedback-analyzed State-Changed-By: dgaudet State-Changed-When: Sat May 1 10:41:20 PDT 1999 State-Changed-Why: This sounds like the same kernel bug described in 3312: http://bugs.apache.org/index/full/3312 no solution known Dean
Re: os-linux/3343: Server dies after 1-20 hours of usage.
[In order for any reply to be added to the PR database, ] [you need to include [EMAIL PROTECTED] in the Cc line ] [and leave the subject line UNCHANGED. This is not done] [automatically because of the potential for mail loops. ] [If you do not include this Cc, your reply may be ig- ] [nored unless you are responding to an explicit request ] [from a developer. ] [Reply only with text; DO NOT SEND ATTACHMENTS! ] Synopsis: Server dies after 1-20 hours of usage. State-Changed-From-To: feedback-analyzed State-Changed-By: dgaudet State-Changed-When: Sat May 1 10:43:13 PDT 1999 State-Changed-Why: This sounds like the same kernel bug as reported in PR#3312: http://bugs.apache.org/index/full/3312 no workaround known at the moment Dean
Re: os-linux/3343: Server dies after 1-20 hours of usage.
[In order for any reply to be added to the PR database, ] [you need to include [EMAIL PROTECTED] in the Cc line ] [and leave the subject line UNCHANGED. This is not done] [automatically because of the potential for mail loops. ] [If you do not include this Cc, your reply may be ig- ] [nored unless you are responding to an explicit request ] [from a developer. ] [Reply only with text; DO NOT SEND ATTACHMENTS! ] Synopsis: Server dies after 1-20 hours of usage. State-Changed-From-To: analyzed-feedback State-Changed-By: dgaudet State-Changed-When: Sat May 1 10:49:35 PDT 1999 State-Changed-Why: Hey are you still having this problem? You indicated that it happens when some mailing list cron job runs. Do you use sendmail or qmail? When the problem happens, could you use strace -p pid_of_parent to find out what the parent is doing and mail me the output? Thanks Dean
Re: os-linux/2774: Heavily loaded webserver stops accepting all connections after some time.
[In order for any reply to be added to the PR database, ] [you need to include [EMAIL PROTECTED] in the Cc line ] [and leave the subject line UNCHANGED. This is not done] [automatically because of the potential for mail loops. ] [If you do not include this Cc, your reply may be ig- ] [nored unless you are responding to an explicit request ] [from a developer. ] [Reply only with text; DO NOT SEND ATTACHMENTS! ] Synopsis: Heavily loaded webserver stops accepting all connections after some time. Comment-Added-By: dgaudet Comment-Added-When: Sat May 1 10:51:54 PDT 1999 Comment-Added: Do you still have this problem with 1.3.6? We changed the default locking behaviour on linux back to the 1.2.x settings. Dean
Re: os-linux/3353: Server processes die, only one remains (root)
[In order for any reply to be added to the PR database, ] [you need to include [EMAIL PROTECTED] in the Cc line ] [and leave the subject line UNCHANGED. This is not done] [automatically because of the potential for mail loops. ] [If you do not include this Cc, your reply may be ig- ] [nored unless you are responding to an explicit request ] [from a developer. ] [Reply only with text; DO NOT SEND ATTACHMENTS! ] Synopsis: Server processes die, only one remains (root) Comment-Added-By: dgaudet Comment-Added-When: Sat May 1 10:53:46 PDT 1999 Comment-Added: Is your problem still occuring? I'm still interested in getting an strace of the parent process when the problem occurs... it sounds like a kernel bug which we're trying to get more data on so that we can get the linux folks to fix it. Dean
Re: os-linux/3897: 1.3.4 server starts, seemingly normally... dies, no children, no errors not the case with 1.2.0
[In order for any reply to be added to the PR database, ] [you need to include [EMAIL PROTECTED] in the Cc line ] [and leave the subject line UNCHANGED. This is not done] [automatically because of the potential for mail loops. ] [If you do not include this Cc, your reply may be ig- ] [nored unless you are responding to an explicit request ] [from a developer. ] [Reply only with text; DO NOT SEND ATTACHMENTS! ] Synopsis: 1.3.4 server starts, seemingly normally... dies, no children, no errors not the case with 1.2.0 Comment-Added-By: dgaudet Comment-Added-When: Sat May 1 10:56:49 PDT 1999 Comment-Added: [This is a standard response.] This Apache problem report has not been updated recently. Please reply to this message if you have any additional information about this issue, or if you have answers to any questions that have been posed to you. If there are no outstanding questions, please consider this a request to try to reproduce the problem with the latest software release, if one has been made since last contact. If we don't hear from you, this report will be closed. If you have information to add, BE SURE to reply to this message and include the [EMAIL PROTECTED] address so it will be attached to the problem report!
cvs commit: apache-1.3/src/modules/proxy proxy_ftp.c proxy_http.c proxy_util.c
dgaudet 99/05/01 10:02:30
Modified:src CHANGES
src/main http_main.c
src/modules/proxy proxy_ftp.c proxy_http.c proxy_util.c
Log:
*) Fix intermittent SEGV in ap_proxy_cache_error() in
src/modules/proxy_util.c where a NULL filepointer and temporary
filename were closed and unlinked.
*) Fix inconsistant error messages reported by mod_proxy
PR: 3178
Submitted by: Graham Leggett [EMAIL PROTECTED]
Revision ChangesPath
1.1337+8 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1336
retrieving revision 1.1337
diff -u -r1.1336 -r1.1337
--- CHANGES 1999/05/01 13:42:07 1.1336
+++ CHANGES 1999/05/01 17:02:24 1.1337
@@ -1,5 +1,13 @@
Changes with Apache 1.3.7
+ *) Fix intermittent SEGV in ap_proxy_cache_error() in
+ src/modules/proxy_util.c where a NULL filepointer and
+ temporary filename were closed and unlinked.
+ [Graham Leggett [EMAIL PROTECTED]] PR#3178
+
+ *) Fix inconsistant error messages reported by mod_proxy.
+ [Graham Leggett [EMAIL PROTECTED]]
+
*) OS/2: Fix terminating CGIs that aren't compiled by EMX GCC when a
connection is aborted. [Brian Havard]
1.433 +2 -1 apache-1.3/src/main/http_main.c
Index: http_main.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.432
retrieving revision 1.433
diff -u -r1.432 -r1.433
--- http_main.c 1999/04/27 20:36:31 1.432
+++ http_main.c 1999/05/01 17:02:26 1.433
@@ -3678,6 +3678,7 @@
#endif
#endif
signal(SIGALRM, alrm_handler);
+signal(SIGUSR2, alrm_handler);
#ifdef TPF
signal(SIGHUP, just_die);
signal(SIGTERM, just_die);
@@ -4241,7 +4242,7 @@
else if (ps-last_rtime + ss-timeout_len now) {
/* no progress, and the timeout length has been exceeded */
ss-timeout_len = 0;
- kill(ps-pid, SIGALRM);
+ kill(ps-pid, SIGUSR2);
}
}
#endif
1.75 +18 -5 apache-1.3/src/modules/proxy/proxy_ftp.c
Index: proxy_ftp.c
===
RCS file: /home/cvs/apache-1.3/src/modules/proxy/proxy_ftp.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- proxy_ftp.c 1999/04/09 13:06:28 1.74
+++ proxy_ftp.c 1999/05/01 17:02:28 1.75
@@ -323,8 +323,11 @@
while (!con-aborted) {
n = ap_bgets(buf, sizeof buf, f);
if (n == -1) { /* input error */
- if (c != NULL)
+ if (c != NULL) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, c-req,
+ proxy: error reading from %s, c-url);
c = ap_proxy_cache_error(c);
+ }
break;
}
if (n == 0)
@@ -383,8 +386,11 @@
o = 0;
total_bytes_sent += n;
- if (c != NULL c-fp ap_bwrite(c-fp, buf, n) != n)
+ if (c != NULL c-fp ap_bwrite(c-fp, buf, n) != n) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, c-req,
+ proxy: error writing to %s, c-tempfile);
c = ap_proxy_cache_error(c);
+ }
while (n !r-connection-aborted) {
w = ap_bwrite(con-client, buf[o], n);
@@ -1196,8 +1202,11 @@
if (!r-assbackwards)
ap_rvputs(r, HTTP/1.0 , r-status_line, CRLF, NULL);
if (c != NULL c-fp != NULL
- ap_bvputs(c-fp, HTTP/1.0 , r-status_line, CRLF, NULL) == -1)
- c = ap_proxy_cache_error(c);
+ ap_bvputs(c-fp, HTTP/1.0 , r-status_line, CRLF, NULL) == -1) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, c-req,
+ proxy: error writing CRLF to %s, c-tempfile);
+ c = ap_proxy_cache_error(c);
+}
/* send headers */
tdo.req = r;
@@ -1206,8 +1215,11 @@
if (!r-assbackwards)
ap_rputs(CRLF, r);
-if (c != NULL c-fp != NULL ap_bputs(CRLF, c-fp) == -1)
+if (c != NULL c-fp != NULL ap_bputs(CRLF, c-fp) == -1) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, c-req,
+ proxy: error writing CRLF to %s, c-tempfile);
c = ap_proxy_cache_error(c);
+}
ap_bsetopt(r-connection-client, BO_BYTECT, zero);
r-sent_bodyct = 1;
@@ -1226,6 +1238,7 @@
/* XXX: we checked for 125||150||226||250 above. This is redundant. */
if (rc != 226 rc != 250)
+/* XXX: we no longer log an error writing to c-tempfile -
should we? */
c = ap_proxy_cache_error(c);
}
else {
1.64 +21 -7 apache-1.3/src/modules/proxy/proxy_http.c
Index
cvs commit: apache-1.3/src CHANGES
dgaudet 99/05/01 10:03:50 Modified:src CHANGES Log: PR#3178 submitter also diagnosed the fix Revision ChangesPath 1.1338+2 -1 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1337 retrieving revision 1.1338 diff -u -r1.1337 -r1.1338 --- CHANGES 1999/05/01 17:02:24 1.1337 +++ CHANGES 1999/05/01 17:03:48 1.1338 @@ -3,7 +3,8 @@ *) Fix intermittent SEGV in ap_proxy_cache_error() in src/modules/proxy_util.c where a NULL filepointer and temporary filename were closed and unlinked. - [Graham Leggett [EMAIL PROTECTED]] PR#3178 + [Graham Leggett [EMAIL PROTECTED], + Tim Costello [EMAIL PROTECTED]] PR#3178 *) Fix inconsistant error messages reported by mod_proxy. [Graham Leggett [EMAIL PROTECTED]]
cvs commit: apache-1.3/src/modules/standard mod_autoindex.c
dgaudet 99/05/01 10:13:05 Modified:src/modules/standard mod_autoindex.c Log: fix a slight problem with my recent fix to mod_autoindex Submitted by: Raymond S Brand [EMAIL PROTECTED] Revision ChangesPath 1.104 +2 -2 apache-1.3/src/modules/standard/mod_autoindex.c Index: mod_autoindex.c === RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_autoindex.c,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- mod_autoindex.c 1999/04/21 02:00:55 1.103 +++ mod_autoindex.c 1999/05/01 17:13:04 1.104 @@ -1167,8 +1167,8 @@ nwidth = name_width; } ap_rvputs(r, A HREF=\, anchor, \, - ap_escape_html(scratch, t2), pad_scratch + nwidth, - /A, NULL); + ap_escape_html(scratch, t2), /A, pad_scratch + nwidth, + NULL); /* * The blank before the storm.. er, before the next field. */
Re: mod_cgi/3751: CGI scripts arent killed when they are in deadlock
[In order for any reply to be added to the PR database, ] [you need to include [EMAIL PROTECTED] in the Cc line ] [and leave the subject line UNCHANGED. This is not done] [automatically because of the potential for mail loops. ] [If you do not include this Cc, your reply may be ig- ] [nored unless you are responding to an explicit request ] [from a developer. ] [Reply only with text; DO NOT SEND ATTACHMENTS! ] Synopsis: CGI scripts arent killed when they are in deadlock State-Changed-From-To: feedback-closed State-Changed-By: dgaudet State-Changed-When: Thu Apr 22 02:42:23 PDT 1999 State-Changed-Why: user switched to fastcgi
Re: general/3964: Http server intermittantly dies with Alarm clock (SIGALRM?).
[In order for any reply to be added to the PR database, ] [you need to include [EMAIL PROTECTED] in the Cc line ] [and leave the subject line UNCHANGED. This is not done] [automatically because of the potential for mail loops. ] [If you do not include this Cc, your reply may be ig- ] [nored unless you are responding to an explicit request ] [from a developer. ] [Reply only with text; DO NOT SEND ATTACHMENTS! ] Synopsis: Http server intermittantly dies with Alarm clock (SIGALRM?). State-Changed-From-To: open-closed State-Changed-By: dgaudet State-Changed-When: Tue Apr 20 16:03:59 PDT 1999 State-Changed-Why: Why are you using inetd mode? Why the heck won't anyone else in the apache group listen to me when I say that inetd mode should be deprecated? It's evil, broken, and never tested by anyone in the apache group. I suggest you use standalone mode. Your problem will go away. Dean
Re: general/3942: During make install I saw Abort - core several times.
[In order for any reply to be added to the PR database, ] [you need to include [EMAIL PROTECTED] in the Cc line ] [and leave the subject line UNCHANGED. This is not done] [automatically because of the potential for mail loops. ] [If you do not include this Cc, your reply may be ig- ] [nored unless you are responding to an explicit request ] [from a developer. ] [Reply only with text; DO NOT SEND ATTACHMENTS! ] Synopsis: During make install I saw Abort - core several times. State-Changed-From-To: open-closed State-Changed-By: dgaudet State-Changed-When: Tue Apr 20 16:17:47 PDT 1999 State-Changed-Why: [This is a standard response.] No response from submitter, assuming issue has been resolved.
Re: mod_status/3936: 'extendedstatus on' doesn't work
[In order for any reply to be added to the PR database, ] [you need to include [EMAIL PROTECTED] in the Cc line ] [and leave the subject line UNCHANGED. This is not done] [automatically because of the potential for mail loops. ] [If you do not include this Cc, your reply may be ig- ] [nored unless you are responding to an explicit request ] [from a developer. ] [Reply only with text; DO NOT SEND ATTACHMENTS! ] Synopsis: 'extendedstatus on' doesn't work State-Changed-From-To: open-closed State-Changed-By: dgaudet State-Changed-When: Tue Apr 20 16:18:30 PDT 1999 State-Changed-Why: ralf did it
Re: config/3935: XLS in mime.types
[In order for any reply to be added to the PR database, ] [you need to include [EMAIL PROTECTED] in the Cc line ] [and leave the subject line UNCHANGED. This is not done] [automatically because of the potential for mail loops. ] [If you do not include this Cc, your reply may be ig- ] [nored unless you are responding to an explicit request ] [from a developer. ] [Reply only with text; DO NOT SEND ATTACHMENTS! ] Synopsis: XLS in mime.types State-Changed-From-To: open-closed State-Changed-By: dgaudet State-Changed-When: Tue Apr 20 16:20:13 PDT 1999 State-Changed-Why: Yeah I added it. That doesn't mean it'll make it to distribution, because some folks insist that mime.types match some standard somewhere and .xls isn't in that standard, or some nonsense like that. Dean
Re: os-solaris/3931: on a kill -HUP of the pid, if server has been running over a few days it reboots the solaris x86 and nukes the httpd.conf file
[In order for any reply to be added to the PR database, ] [you need to include [EMAIL PROTECTED] in the Cc line ] [and leave the subject line UNCHANGED. This is not done] [automatically because of the potential for mail loops. ] [If you do not include this Cc, your reply may be ig- ] [nored unless you are responding to an explicit request ] [from a developer. ] [Reply only with text; DO NOT SEND ATTACHMENTS! ] Synopsis: on a kill -HUP of the pid, if server has been running over a few days it reboots the solaris x86 and nukes the httpd.conf file State-Changed-From-To: open-closed State-Changed-By: dgaudet State-Changed-When: Tue Apr 20 16:26:39 PDT 1999 State-Changed-Why: To be honest, I suspect it's something you have compiled into the server. Or maybe it's the RAM in your box. But nobody else seems to be having the same troubles... if you get any more info, open a new PR please. Sorry we can't be of more help. Dean
Re: general/3920: Umask is inherited by Apache CGIs
[In order for any reply to be added to the PR database, ] [you need to include [EMAIL PROTECTED] in the Cc line ] [and leave the subject line UNCHANGED. This is not done] [automatically because of the potential for mail loops. ] [If you do not include this Cc, your reply may be ig- ] [nored unless you are responding to an explicit request ] [from a developer. ] [Reply only with text; DO NOT SEND ATTACHMENTS! ] Synopsis: Umask is inherited by Apache CGIs State-Changed-From-To: open-closed State-Changed-By: dgaudet State-Changed-When: Tue Apr 20 16:28:10 PDT 1999 State-Changed-Why: I suggest editing your apachectl script to change the umask. There is no one setting which we could default to which makes sense for all systems. For some, 022 is right, for others 002 is right. If you've got admins using different umasks I think you've got other problems... what happens if they create files as root? Dean
Re: general/3917: Page with multiple framesets causes the browser to crash
[In order for any reply to be added to the PR database, ] [you need to include [EMAIL PROTECTED] in the Cc line ] [and leave the subject line UNCHANGED. This is not done] [automatically because of the potential for mail loops. ] [If you do not include this Cc, your reply may be ig- ] [nored unless you are responding to an explicit request ] [from a developer. ] [Reply only with text; DO NOT SEND ATTACHMENTS! ] Synopsis: Page with multiple framesets causes the browser to crash State-Changed-From-To: open-feedback State-Changed-By: dgaudet State-Changed-When: Tue Apr 20 16:30:56 PDT 1999 State-Changed-Why: I doubt this is an apache bug. It's probably either an OS bug, or a browser bug. There's two things I can think of that you should try: - disable KeepAlive - add -DNO_WRITEV when compiling apache Tell me if either of those do the job please... then we can try to figure out more details of what the bug actually is. Dean
Re: os-linux/3911: Under high load, server hangs in flock or fnctl.
[In order for any reply to be added to the PR database, ] [you need to include [EMAIL PROTECTED] in the Cc line ] [and leave the subject line UNCHANGED. This is not done] [automatically because of the potential for mail loops. ] [If you do not include this Cc, your reply may be ig- ] [nored unless you are responding to an explicit request ] [from a developer. ] [Reply only with text; DO NOT SEND ATTACHMENTS! ] Synopsis: Under high load, server hangs in flock or fnctl. State-Changed-From-To: feedback-closed State-Changed-By: dgaudet State-Changed-When: Tue Apr 20 16:34:39 PDT 1999 State-Changed-Why: At any rate we switched back to fcntl locking in apache 1.3.6.
