cvs commit: apachen/src/main http_main.c
dougm 97/09/12 14:40:13
Modified:src CHANGES
src/main http_main.c
Log:
go back to old behavior of calling init_modules() twice at server startup
Submitted by: Doug MacEachern
Reviewed by: Dean Gaudet
Revision ChangesPath
1.439 +0 -2 apachen/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.438
retrieving revision 1.439
diff -u -r1.438 -r1.439
--- CHANGES 1997/09/12 20:38:43 1.438
+++ CHANGES 1997/09/12 21:40:04 1.439
@@ -173,8 +173,6 @@
*) init_modules is now called after the error logs have been opened. This
allows modules to emit information messages into the error logs.
- init_modules is only called once in standalone config now, previously
- it was called twice (once after each config file reading).
[Dean Gaudet]
*) Fixed proxy-pass-through feature of mod_rewrite; Added error logging
1.220 +1 -0 apachen/src/main/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apachen/src/main/http_main.c,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- http_main.c 1997/09/12 20:37:34 1.219
+++ http_main.c 1997/09/12 21:40:09 1.220
@@ -3543,6 +3543,7 @@
suexec_enabled = init_suexec();
server_conf = read_config (pconf, ptrans, server_confname);
+init_modules (pconf, server_conf);
if(standalone) {
clear_pool (pconf); /* standalone_main rereads... */
cvs commit: apachen/src/main http_config.h http_main.c http_main.h
dougm 97/09/10 10:43:26
Modified:src CHANGES
src/main http_config.h http_main.c http_main.h
Log:
add child_terminate() function
Submitted by: Doug MacEachern
Reviewed by: Alexei Kosut, Jim Jagielski, Rob Hartill
Revision ChangesPath
1.432 +5 -0 apachen/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.431
retrieving revision 1.432
diff -u -r1.431 -r1.432
--- CHANGES 1997/09/09 18:36:53 1.431
+++ CHANGES 1997/09/10 17:43:17 1.432
@@ -1,5 +1,10 @@
Changes with Apache 1.3b1
+ *) API: New function child_terminate() triggers the child process to
+ exit, while allowing the child finish what it needs to for the
+ current request first.
+ [Doug MacEachern, Alexei Kosut]
+
*) Windows now defaults to using full status reports with mod_status.
[Alexei Kosut, PR #1094]
1.49 +1 -1 apachen/src/main/http_config.h
Index: http_config.h
===
RCS file: /export/home/cvs/apachen/src/main/http_config.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- http_config.h 1997/09/02 16:19:17 1.48
+++ http_config.h 1997/09/10 17:43:21 1.49
@@ -246,7 +246,7 @@
* handle it back-compatibly, or at least signal an error).
*/
-#define MODULE_MAGIC_NUMBER 19970902
+#define MODULE_MAGIC_NUMBER 19970909
#define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL
/* Generic accessors for other modules to get at their own module-specific
1.216 +6 -0 apachen/src/main/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apachen/src/main/http_main.c,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- http_main.c 1997/09/03 21:50:54 1.215
+++ http_main.c 1997/09/10 17:43:22 1.216
@@ -2591,6 +2591,12 @@
static int requests_this_child;
static fd_set main_fds;
+API_EXPORT(void) child_terminate (request_rec *r)
+{
+r->connection->keepalive = 0;
+requests_this_child = max_requests_per_child = 1;
+}
+
void child_main(int child_num_arg)
{
NET_SIZE_T clen;
1.17 +1 -0 apachen/src/main/http_main.h
Index: http_main.h
===
RCS file: /export/home/cvs/apachen/src/main/http_main.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- http_main.h 1997/07/21 05:53:46 1.16
+++ http_main.h 1997/09/10 17:43:23 1.17
@@ -91,6 +91,7 @@
API_EXPORT(void) kill_timeout (request_rec *);
API_EXPORT(void) reset_timeout (request_rec *);
+API_EXPORT(void) child_terminate (request_rec *r);
API_EXPORT(void) sync_scoreboard_image (void);
int update_child_status (int child_num, int status, request_rec *r);
void time_process_request (int child_num, int status);
cvs commit: apache-site ABOUT_APACHE.html
dougm 97/08/10 08:08:51 Modified:.ABOUT_APACHE.html Log: me again Revision ChangesPath 1.6 +8 -2 apache-site/ABOUT_APACHE.html Index: ABOUT_APACHE.html === RCS file: /export/home/cvs/apache-site/ABOUT_APACHE.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ABOUT_APACHE.html 1997/08/01 09:17:20 1.5 +++ ABOUT_APACHE.html 1997/08/10 15:08:50 1.6 @@ -202,15 +202,21 @@ - Chuck Murcko + Doug MacEachern - The Topsail Group, Pennsylvania + TOG Research Institute, Massachusetts Aram W. Mirzadeh Qosina Corporation, New York + + + + Chuck Murcko + + The Topsail Group, Pennsylvania
cvs commit: apache-site/contributors index.html
dougm 97/08/09 09:36:53 Modified:contributors index.html Log: added blurb about me Submitted by: Doug MacEachern Revision ChangesPath 1.16 +18 -0 apache-site/contributors/index.html Index: index.html === RCS file: /export/home/cvs/apache-site/contributors/index.html,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- index.html1997/08/03 10:11:08 1.15 +++ index.html1997/08/09 16:36:52 1.16 @@ -79,6 +79,10 @@ mod_info, mod_php + Doug MacEachern + Perl whacker and DCE slinger + + Aram W. Mirzadeh Linux & SCO porting. @@ -307,6 +311,20 @@ OS Expertise: Solaris, Linux Contribution: Wrote mod_info module included in the distribution, as well as mod_php which is available separately. + + + +Name: Doug MacEachern +email: mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED] +URL: http://www.opengroup.org/~dougm/";>http://www.opengroup.org/~dougm/ +Organization: http://www.opengroup.org/";>TOG Research Institute +Occupation: Research Engineer +Location: Boston MA, USA +Comment: Yes, it can be done with Perl +Contributions: http://perl.apache.org/";>mod_perl, +plugin-ability for transport mechanisms such as DCE RPC, +sfio support, various API additions, mod_perl/mod_include integration, +dbmmanage overhaul
cvs commit: apache KEYS
dougm 97/08/09 09:25:55 Modified:.KEYS Log: added my key to KEYS Revision ChangesPath 1.11 +13 -0 apache/KEYS Index: KEYS === RCS file: /export/home/cvs/apache/KEYS,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- KEYS 1997/07/25 10:40:45 1.10 +++ KEYS 1997/08/09 16:25:55 1.11 @@ -185,3 +185,16 @@ hiXZ =K7lL -END PGP PUBLIC KEY BLOCK- + +Type bits/keyIDDate User ID +pub 1024/45B91DF1 1996/03/02 Doug MacEachern <[EMAIL PROTECTED]> + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: 2.6.2 + +mQCNAzE4lesAAAEEAKJYS1vL2iB3owwiZdCxp3JyvSNaC7h1p2jQXcJvY10gqyZm +VffDwFoSvJM1JdCx3o1mb3JpZ2OTV4SrDDkzcSpTXelgyh7k9O3HB7oG6pHTML9g +Dq9ZKydShMIvIJos7KuLWoM/jtkv7r/gWsGHAyKbT8fs3r7nlmxFuR3xAAUX +tB9Eb3VnIE1hY0VhY2hlcm4gPGRvdWdtQG9zZi5vcmc+ +=yaR9 +-END PGP PUBLIC KEY BLOCK-
cvs commit: apache ABOUT_APACHE CHANGES
dougm 97/08/09 09:11:11 Modified:.ABOUT_APACHE CHANGES Log: added blurbs in CHANGES Revision ChangesPath 1.5 +1 -0 apache/ABOUT_APACHE Index: ABOUT_APACHE === RCS file: /export/home/cvs/apache/ABOUT_APACHE,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ABOUT_APACHE 1997/08/01 09:18:25 1.4 +++ ABOUT_APACHE 1997/08/09 16:11:10 1.5 @@ -80,6 +80,7 @@ Alexei Kosut Stanford University, California Ben Laurie Freelance Consultant, UK Chuck Murcko The Topsail Group, Pennsylvania + Doug MacEachernTOG Research Institute, Massachusetts Aram W. Mirzadeh Qosina Corporation, New York Sameer Parekh C2Net, California Paul SuttonUKWeb, UK 1.13 +33 -0 apache/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache/CHANGES,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- CHANGES 1997/08/05 10:57:55 1.12 +++ CHANGES 1997/08/09 16:11:10 1.13 @@ -64,6 +64,12 @@ to set up anything that need to be done once per processes. For example, connections to databases. + *) New child_exit function for module API + A new phase for Apache's API is called prior to termination of + a server child, e.g. when max_requests_per_child is reached. + This allow for modules to tear down anything that need to be done + once per processes. For example, connections to databases. + *) Totally overhauled mod_rewrite: First the last officially available release of mod_rewrite (3.0.9) was integrated into the Apache source repository. Additionally to the fact @@ -79,4 +85,31 @@ construction point (RewriteRule subst string, RewriteCond test string, ENV flag key/value, etc.) to access the parts of RewriteRule and RewriteCond patterns via $N and %N. + + *) Simple transport and i/o hooks in place + It is possible to re-define the standalone_main function + (with -DSTANDALONE_MAIN) so modules may plugin support for + transport protocols other than tcp, e.g. DCE RPC + A new slot in the BUFF structure `t_handle' is provided to + store the plugin's transport related structures. + Support for sfio can be enabled with -DB_SFIO, which allows + modules to re-define lowest-level reads and writes so i/o + may travel through something other than a tcp socket. + In addition, sfio support allows plugin modules to manipulate + the output of all modules, e.g. parsing the output of CGI programs. + + *) New dbmmange script + A new Perl5 version of dbmmange allows modification of + various databases, Berkley DB, ndbm and gdbm. Security has + been tightened such that passwords will no longer be echoed to + the terminal, the seed for srand is more random and `add' will not + overwrite and existing user, use the new `update' command + instead. New commands include the `check' command to check a + users' password and the `import' command to convert existing + password text-files or dbm files exported with `view'. + + *) New API function: is_initial_req() + The function returns true only for the initial call during a + given HTTP request. If the request is a sub-request or + internal redirect, the function will return false.
cvs commit: apache/src CHANGES
dougm 97/08/02 15:43:52
Modified:src CHANGES
Log:
noted dbmmange overhaul
Submitted by: Doug MacEachern
Revision ChangesPath
1.381 +16 -0 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -r1.380 -r1.381
--- CHANGES 1997/08/02 06:49:33 1.380
+++ CHANGES 1997/08/02 22:43:50 1.381
@@ -1,5 +1,21 @@
Changes with Apache 1.3a2
+ *) dbmmanage overhaul:
+ - merge dbmmanage and dbmmanage.new functionality, remove dbmmanage.new
+ - tie() to AnyDBM_File which will use one of DB_File, NDBM_File or
+ GDBM_File (-ldb, -lndbm, -lgdbm) (trying each in that order)
+ - provide better seed for rand
+ - prompt for password as per getpass(3) (turn off echo, read from
+ /dev/tty, etc.)
+ - use "newstyle" crypt based on $Config{osname} ($^O)
+ - will not add a user if already in database, use new `update' command
+ instead
+ - added `check' command to check a users' password
+ - added `import' command to convert existing password text-files or
+ dbm files exported with `view'
+ - more descriptive usage, general cleanup, 'use strict' clean, etc.
+ [Doug MacEachern]
+
*) Added psocket() which is a pool form of socket(), various places within
the proxy weren't properly blocking alarms while registering the cleanup
for its sockets. bclose() now uses pclose() and pclosesocket(). There
cvs commit: apache/support dbmmanage dbmmanage.readme dbmmanage.new
dougm 97/08/02 15:42:27
Modified:support dbmmanage dbmmanage.readme
Removed: support dbmmanage.new
Log:
dbmmanage overhaul (see CHANGES)
removed dbmmanage.new
updated dbmmanage.readme
Submitted by: Doug MacEachern
Reviewed by: Dean Gaudet, Randy Terbush, Marc Slemko
Revision ChangesPath
1.7 +128 -70 apache/support/dbmmanage
Index: dbmmanage
===
RCS file: /export/home/cvs/apache/support/dbmmanage,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dbmmanage 1997/01/01 18:26:15 1.6
+++ dbmmanage 1997/08/02 22:42:24 1.7
@@ -50,77 +50,135 @@
# For more information on the Apache Group and the Apache HTTP server
# project, please see <http://www.apache.org/>.
-
-# usage: dbmmanage
-#
-# commands: add, delete, view, adduser
+#for more functionality see the HTTPD::UserAdmin module:
+# http://www.perl.com/CPAN/modules/by-module/HTTPD/HTTPD-Tools-x.xx.tar.gz
#
-# no values needed for delete, no keys or values needed for view.
-# to change a value, simply use "add".
-# adduser encrypts the password:
-# dbmmanage adduser
-#
-# is optional, and may also be supplied to add the user
-# to a specified group:
-# dbmmanage adduser
-
-if (scalar(@ARGV) < 2) {
- print "Too few arguments.\n";
- exit;
-}
-
-$file=$ARGV[0];
-$command=$ARGV[1];
-$key=$ARGV[2];
-$value=$ARGV[3];
-$group=$ARGV[4];
-
-# create a random salt
[EMAIL PROTECTED]('0'..'9','a'..'z','A'..'Z');
-srand($$|time);
-$salt=$range[rand(int($#range)+1)] . $range[rand(int($#range)+1)];
-
-if ($command eq "add") {
-dbmopen(%DB, $file, 0664) || die "Error: $!\n";
-$value .= ":$group" if $group ne "";
-$DB{$key} = $value;
-dbmclose(%DB);
- print "Entry $key added with value $value.\n";
- exit;
-}
-
-if ($command eq "adduser") {
- $hash = crypt($value, "$salt");
-dbmopen(%DB, $file, 0664) || die "Error: $!\n";
-$hash .= ":$group" if $group ne "";
-$value .= ":$group" if $group ne "";
-$DB{$key} = $hash;
-dbmclose(%DB);
- print "User $key added with password $value, encrypted to $hash\n";
- exit;
-}
-
-if ($command eq "delete") {
-dbmopen(%DB, $file, 0664) || die "Error: $!\n";
-delete($DB{$key});
-dbmclose(%DB);
- exit;
-}
-
-if ($command eq "view") {
-dbmopen(%DB, $file, undef) || die "Error: $!\n";
-$return_status = 1;
-unless ($key) {
-while (($nkey,$val) = each %DB) {
-print "$nkey = $val\n";
-}
-} else {
-$return_status = 0 if defined $DB{$key};
-print "$key = $DB{$key}\n";
-}
-dbmclose(%DB);
- exit($return_status);
+# usage: dbmmanage
+
+package dbmmanage;
+# -ldb-lndbm-lgdbm
+BEGIN { @AnyDBM_File::ISA = qw(DB_File NDBM_File GDBM_File) }
+use strict;
+use Fcntl;
+use AnyDBM_File ();
+
+my($file,$command,$key,$crypted_pwd) = @ARGV;
+
+usage() unless $file and $command and defined &{$dbmc::{$command}};
+
+# if your osname is in $newstyle_salt, then use new style salt (starts with
'_' and contains
+# four bytes of iteration count and four bytes of salt). Otherwise, just use
+# the traditional two-byte salt.
+# see the man page on your system to decide if you have a newer crypt() lib.
+# I believe that 4.4BSD derived systems do (at least BSD/OS 2.0 does).
+# The new style crypt() allows up to 20 characters of the password to be
+# significant rather than only 8.
+my $newstyle_salt = join '|', qw{bsdos}; #others?
+
+# remove extension if any
+my $chop = join '|', qw{db.? pag dir};
+$file =~ s/\.($chop)$//;
+
+my $is_update = $command eq "update";
+my $Is_Win32 = $^O eq "MSWin32";
+my %DB = ();
+my @range = ();
+my($mode, $flags) = $command =~
+/^(?:view|check)$/ ? (undef, O_RDONLY) : (0644, O_RDWR|O_CREAT);
+
+tie %DB, "AnyDBM_File", $file, $flags, $mode;
+dbmc->$command();
+untie %DB;
+
+sub usage {
+my $cmds = join "|", sort keys %dbmc::;
+die "usage: $0 filename [$cmds] [username]\n";
+}
+
+my $x;
+sub genseed {
+my $psf;
+for (qw(-xlwwa -le)) {
+ `ps $_ 2>/dev/null`;
+ $psf = $_, last unless $?;
+}
+srand (time ^ $$ ^
cvs commit: apache/src/modules/proxy mod_proxy.c
dougm 97/07/28 11:23:30
Modified:src CHANGES http_config.c http_config.h http_core.c
http_main.c mod_access.c mod_actions.c mod_alias.c
mod_asis.c mod_auth.c mod_auth_anon.c
mod_auth_db.c mod_auth_dbm.c mod_autoindex.c
mod_browser.c mod_cern_meta.c mod_cgi.c
mod_digest.c mod_dir.c mod_dld.c mod_env.c
mod_expires.c mod_headers.c mod_imap.c
mod_include.c mod_info.c mod_log_agent.c
mod_log_config.c mod_log_referer.c mod_mime.c
mod_mime_magic.c mod_negotiation.c mod_rewrite.c
mod_status.c mod_userdir.c mod_usertrack.c
src/modules/example mod_example.c
src/modules/proxy mod_proxy.c
Log:
added child_exit hook for modules
Submitted by: Doug MacEachern
Reviewed by: Dean Gaudet
Revision ChangesPath
1.370 +6 -1 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.369
retrieving revision 1.370
diff -u -r1.369 -r1.370
--- CHANGES 1997/07/28 08:46:41 1.369
+++ CHANGES 1997/07/28 18:22:40 1.370
@@ -1,5 +1,10 @@
Changes with Apache 1.3a2
+ *) API: Added child_exit function to module structure. This is called
+ once per "heavy-weight process" just before a server child exit()'s
+ e.g. when max_requests_per_child is reached, etc.
+ [Doug MacEachern, Dean Gaudet]
+
*) mod_include cleanup showed that handle_else was being used to handle
endif. It didn't cause problems, but it was cleaned up too.
[Howard Fear]
@@ -390,7 +395,7 @@
*) Fixed open timestamp fd in proxy_cache.c [Chuck Murcko]
*) Added undocumented perl SSI mechanism for -DUSE_PERL_SSI and mod_perl.
- [Rob Hartill]
+ [Doug MacEachern, Rob Hartill]
*) Proxy needs to use hard_timeout instead of soft_timeout when it is
reading from one buffer and writing to another, at least until it has
1.68 +18 -0 apache/src/http_config.c
Index: http_config.c
===
RCS file: /export/home/cvs/apache/src/http_config.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- http_config.c 1997/07/27 03:13:30 1.67
+++ http_config.c 1997/07/28 18:22:42 1.68
@@ -1242,6 +1242,24 @@
(*m->child_init) (s, p);
}
+void child_exit_modules(pool *p, server_rec *s)
+{
+module *m;
+
+#ifdef SIGHUP
+signal (SIGHUP, SIG_IGN);
+#endif
+#ifdef SIGUSR1
+signal (SIGUSR1, SIG_IGN);
+#endif
+
+for (m = top_module; m; m = m->next)
+if (m->child_exit)
+ (*m->child_exit) (s, p);
+
+exit(0);
+}
+
/
* Configuration directives are restricted in terms of where they may
* appear in the main configuration files and/or .htaccess files according
1.41 +8 -1 apache/src/http_config.h
Index: http_config.h
===
RCS file: /export/home/cvs/apache/src/http_config.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- http_config.h 1997/07/21 05:53:42 1.40
+++ http_config.h 1997/07/28 18:22:43 1.41
@@ -233,6 +233,12 @@
#else
void (*child_init)(server_rec *, pool *);
#endif
+#ifdef ULTRIX_BRAIN_DEATH
+void (*child_exit)();
+#else
+void (*child_exit)(server_rec *, pool *);
+#endif
+
} module;
/* Initializer for the first few module slots, which are only
@@ -242,7 +248,7 @@
* handle it back-compatibly, or at least signal an error).
*/
-#define MODULE_MAGIC_NUMBER 19970719
+#define MODULE_MAGIC_NUMBER 19970728
#define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL
/* Generic accessors for other modules to get at their own module-specific
@@ -282,6 +288,7 @@
server_rec *read_config (pool *conf_pool, pool *temp_pool, char
*config_name);
void init_modules(pool *p, server_rec *s);
void child_init_modules(pool *p, server_rec *s);
+void child_exit_modules(pool *p, server_rec *s);
void setup_prelinked_modules(void);
void show_directives(void);
void show_modules(void);
1.101 +2 -1 apache/src/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apache/src/http_core.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- http_core.c
cvs commit: apache-site related_projects.html
dougm 97/07/22 18:11:56 Modified:. related_projects.html Log: updated mod_perl homepage link Submitted by: Doug MacEachern Revision ChangesPath 1.7 +1 -1 apache-site/related_projects.html Index: related_projects.html === RCS file: /export/home/cvs/apache-site/related_projects.html,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- related_projects.html 1997/07/12 02:24:28 1.6 +++ related_projects.html 1997/07/23 01:11:55 1.7 @@ -119,7 +119,7 @@ For more information on Apache/Perl see the -http://www.osf.org/~dougm/apache/";>Apache/Perl Homepage. +http://perl.apache.org/";>Apache/Perl Homepage.
cvs commit: apache/src buff.h
dougm 97/07/19 15:34:06 Modified:src buff.h Log: argh. fixed line-wrap mess from t_handle patch Submitted by: Doug MacEachern Revision ChangesPath 1.21 +1 -3 apache/src/buff.h Index: buff.h === RCS file: /export/home/cvs/apache/src/buff.h,v retrieving revision 1.20 retrieving revision 1.21 diff -C3 -r1.20 -r1.21 *** buff.h1997/07/19 22:29:24 1.20 --- buff.h1997/07/19 22:34:05 1.21 *** *** 101,109 int fd;/* the file descriptor */ int fd_in; /* input file descriptor, if different */ ! /* transport handle, can be used to store things such as an RPC binding h\ ! \ ! andle */ void *t_handle; #ifdef B_SFIO --- 101,107 int fd;/* the file descriptor */ int fd_in; /* input file descriptor, if different */ ! /* transport handle, for RPC binding handle or some such */ void *t_handle; #ifdef B_SFIO
cvs commit: apache/src buff.h
dougm 97/07/19 15:29:25 Modified:src buff.h Log: added transport handle slot (t_handle) to the BUFF structure Submitted by: Doug MacEachern Reviewed by: Dean Gaudet Revision ChangesPath 1.20 +5 -0 apache/src/buff.h Index: buff.h === RCS file: /export/home/cvs/apache/src/buff.h,v retrieving revision 1.19 retrieving revision 1.20 diff -C3 -r1.19 -r1.20 *** buff.h1997/07/15 21:39:51 1.19 --- buff.h1997/07/19 22:29:24 1.20 *** *** 101,106 --- 101,111 int fd;/* the file descriptor */ int fd_in; /* input file descriptor, if different */ + /* transport handle, can be used to store things such as an RPC binding h\ + \ + andle */ + void *t_handle; + #ifdef B_SFIO Sfio_t *sf_in; Sfio_t *sf_out;
cvs commit: apache/src CHANGES
dougm 97/07/19 15:26:57 Modified:src CHANGES Log: logged change for t_handle Revision ChangesPath 1.353 +11 -2 apache/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.352 retrieving revision 1.353 diff -C3 -r1.352 -r1.353 *** CHANGES 1997/07/19 20:27:50 1.352 --- CHANGES 1997/07/19 22:26:55 1.353 *** *** 1,5 --- 1,8 Changes with Apache 1.3 + *) added transport handle slot (t_handle) to the BUFF structure + [Doug MacEachern] + *) get_client_block() returns wrong length if policy is REQUEST_CHUNKED_DECHUNK. [Kenichi Hori <[EMAIL PROTECTED]>] PR#815 *** *** 133,142 *) In configurations using multiple Listen statements it was possible for busy sockets to starve other sockets of service. [Dean Gaudet] ! *) API: It's possible to replace standalone_main (define STANDALONE_MAIN) ! and it's possible to use SFIO for the underlying i/o layer. [Doug MacEachern] *) Enhance UserDir directive (mod_userdir) to accept a list of usernames for the 'disable' keyword, and add 'enable user...' to selectively *en*able userdirs if they're globally disabled. --- 136,151 *) In configurations using multiple Listen statements it was possible for busy sockets to starve other sockets of service. [Dean Gaudet] ! *) Added hook so standalone_main can be replaced at compile time ! (define STANDALONE_MAIN) [Doug MacEachern] + *) Lowest-level read/write functions in buff.c will be replaced with + the SFIO library calls sfread/sfwrite if B_SFIO is defined at + compile time. The default sfio discipline will behave as apache + would without sfio compiled in. + [Doug MacEachern] + *) Enhance UserDir directive (mod_userdir) to accept a list of usernames for the 'disable' keyword, and add 'enable user...' to selectively *en*able userdirs if they're globally disabled.
