cvs commit: apache-1.3/src/main http_config.c http_core.c
dougm 99/05/06 17:16:13 Modified:src CHANGES src/include ap_compat.h ap_mmn.h http_config.h http_core.h src/main http_config.c http_core.c Log: Fix configuration engine re-entrant hangups, which solve a handful of problems seen with mod_perl Perl configuration sections Submitted by: Salvador Ortiz Garcia [EMAIL PROTECTED] Reviewed by: Doug, Dean Revision ChangesPath 1.1351+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1350 retrieving revision 1.1351 diff -u -r1.1350 -r1.1351 --- CHANGES 1999/05/06 00:49:38 1.1350 +++ CHANGES 1999/05/07 00:16:06 1.1351 @@ -1,5 +1,9 @@ Changes with Apache 1.3.7 + *) Fix configuration engine re-entrant hangups, which solve a + handful of problems seen with mod_perl Perl configuration sections + [Salvador Ortiz Garcia [EMAIL PROTECTED]] + *) Mac OS and Mac OS X Server now use the appropriate custom layout by default when building with APACI; allow for platform-specific variable defaults in configure. [Wilfredo Sanchez] 1.17 +2 -0 apache-1.3/src/include/ap_compat.h Index: ap_compat.h === RCS file: /export/home/cvs/apache-1.3/src/include/ap_compat.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ap_compat.h 1999/01/28 09:24:58 1.16 +++ ap_compat.h 1999/05/07 00:16:09 1.17 @@ -23,6 +23,7 @@ #define acquire_mutex ap_acquire_mutex #define add_cgi_vars ap_add_cgi_vars #define add_common_varsap_add_common_vars +#define add_file_conf ap_add_file_conf #define add_module ap_add_module #define add_named_module ap_add_named_module #define add_per_dir_conf ap_add_per_dir_conf @@ -350,6 +351,7 @@ #define server_root_relative ap_server_root_relative #define set_byterange ap_set_byterange #define set_callback_and_alarm ap_set_callback_and_alarm +#define set_config_vectors ap_set_config_vectors #define set_content_length ap_set_content_length #define set_etag ap_set_etag #define set_file_slot ap_set_file_slot 1.34 +3 -1 apache-1.3/src/include/ap_mmn.h Index: ap_mmn.h === RCS file: /export/home/cvs/apache-1.3/src/include/ap_mmn.h,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- ap_mmn.h 1999/04/20 17:51:37 1.33 +++ ap_mmn.h 1999/05/07 00:16:09 1.34 @@ -215,6 +215,8 @@ * 19990108.7 - ap_isxdigit added * 19990320 - METHODS and M_INVALID symbol values modified * 19990320.1 - add ap_vrprintf() + * 19990320.2 - add cmd_parms.context, ap_set_config_vectors, + *export ap_add_file_conf */ #define MODULE_MAGIC_COOKIE 0x41503133UL /* AP13 */ @@ -222,7 +224,7 @@ #ifndef MODULE_MAGIC_NUMBER_MAJOR #define MODULE_MAGIC_NUMBER_MAJOR 19990320 #endif -#define MODULE_MAGIC_NUMBER_MINOR 1 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 2 /* 0...n */ #define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR/* backward compat */ /* Useful for testing for features. */ 1.102 +3 -0 apache-1.3/src/include/http_config.h Index: http_config.h === RCS file: /export/home/cvs/apache-1.3/src/include/http_config.h,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- http_config.h 1999/03/10 10:34:08 1.101 +++ http_config.h 1999/05/07 00:16:10 1.102 @@ -170,6 +170,8 @@ */ const command_rec *cmd; /* configuration command */ const char *end_token; /* end token required to end a nested section */ +void *context; /* per_dir_config vector passed + * to handle_command */ } cmd_parms; /* This structure records the existence of handlers in a module... */ @@ -400,6 +402,7 @@ CORE_EXPORT(const command_rec *) ap_find_command(const char *name, const command_rec *cmds); CORE_EXPORT(const command_rec *) ap_find_command_in_modules(const char *cmd_name, module **mod); +CORE_EXPORT(void *) ap_set_config_vectors(cmd_parms *parms, void *config, module *mod); CORE_EXPORT(const char *) ap_handle_command(cmd_parms *parms, void *config, const char *l); #endif
cvs commit: apache-site/info apache_books.html
dougm 99/03/31 16:39:26 Modified:contributors index.html info apache_books.html Log: some updates Revision ChangesPath 1.69 +4 -3 apache-site/contributors/index.html Index: index.html === RCS file: /export/home/cvs/apache-site/contributors/index.html,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- index.html1999/03/20 23:29:19 1.68 +++ index.html1999/04/01 00:39:24 1.69 @@ -374,9 +374,10 @@ P STRONGName:/STRONG A NAME=dougmDoug MacEachern/ABR -STRONGemail:/STRONG [EMAIL PROTECTED]BR -STRONGOccupation:/STRONG Freelance Consultant BR -STRONGLocation:/STRONG Boston, MA, USA. BR +STRONGemail:/STRONG [EMAIL PROTECTED]BR +STRONGOrganization:/STRONG A HREF=http://www.cp.net/;Critical Path/ABR +STRONGOccupation:/STRONG Senior Software Engineer BR +STRONGLocation:/STRONG San Francisco, CA, USA BR STRONGContributions:/STRONG A HREF=http://perl.apache.org/;mod_perl/A, various API additions P 1.10 +16 -0 apache-site/info/apache_books.html Index: apache_books.html === RCS file: /export/home/cvs/apache-site/info/apache_books.html,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- apache_books.html 1999/03/17 04:48:12 1.9 +++ apache_books.html 1999/04/01 00:39:25 1.10 @@ -29,6 +29,22 @@ UL LI DL + DTA HREF=http://www.oreilly.com/catalog/wrapmod/index.html; + STRONGWriting Apache Modules with Perl and C/STRONG/A/DT + DDAuthor: Lincoln Stein Doug MacEachern + BR + Published by: O'Reilly and Associates + BR + ISBN: 1-56592-567-X + BR + Language: English + BR + Note: a href=http://www.apachemod.com/;companion site/a + /DD + /DL + /LI + LI + DL DTA HREF=http://www.oreilly.com/catalog/apache2/index.html; STRONGApache: The Definitive Guide, 2nd Edition/STRONG/A/DT DDAuthor: Ben Laurie
cvs commit: apache-1.3 ABOUT_APACHE
dougm 99/03/31 16:42:14 Modified:.ABOUT_APACHE Log: back to one summer a year Revision ChangesPath 1.23 +1 -1 apache-1.3/ABOUT_APACHE Index: ABOUT_APACHE === RCS file: /export/home/cvs/apache-1.3/ABOUT_APACHE,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- ABOUT_APACHE 1999/02/14 02:30:47 1.22 +++ ABOUT_APACHE 1999/04/01 00:42:14 1.23 @@ -85,7 +85,7 @@ Alexei Kosut Stanford University, California Martin Kraemer Munich, Germany Ben Laurie Freelance Consultant, UK - Doug MacEachernFreelance Consultant, Summer Seasons, Earth + Doug MacEachernCritical Path, California Aram W. Mirzadeh Qosina Corporation, New York Sameer Parekh C2Net, California Cliff Skolnick Freelance, California
cvs commit: apache-1.3 STATUS
dougm 99/02/25 07:48:53 Modified:.STATUS Log: update for ap_sub_req_method_uri() Revision ChangesPath 1.631 +8 -3 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.630 retrieving revision 1.631 diff -u -r1.630 -r1.631 --- STATUS1999/02/22 12:55:14 1.630 +++ STATUS1999/02/25 15:48:52 1.631 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/02/22 12:55:14 $] + Last modified at [$Date: 1999/02/25 15:48:52 $] Release: @@ -68,6 +68,7 @@ waiting for a review from Dean for the shared memory hard-core stuff. When someone else is also interested please review the shared memory deep-level code. + Doug: +1 on concept (untested) * Fred's [PATCH: srm.conf and access.conf refer to httpd.conf Message-ID: [EMAIL PROTECTED] @@ -124,8 +125,8 @@ Mesage-ID: PR#3246, also available at http://www.physics.mcgill.ca/~juan/mod_include.patch Status: Ken -0 for 1.3/+0 for 2.0, Lars -0 for 1.3 - -* Eric Prud'hommeaux's mod_dir mods for file-level access control. + + * Eric Prud'hommeaux's mod_dir mods for file-level access control. Message-ID: [EMAIL PROTECTED] Status: Jim -0 (The current behavior seems logical to me. If there was more universal interest in changing it, then that would be @@ -139,6 +140,10 @@ * Ronald Tschalär's major update of mod_digest Message-ID: [EMAIL PROTECTED] Status: Big change -- needs review. + +* Greg Stein's ap_sub_req_method_uri() + Message-ID: [EMAIL PROTECTED] + Status: Doug +1 In progress:
cvs commit: apache-site/contributors index.html
dougm 99/02/01 09:51:23 Modified:contributors index.html Log: people seem to think I'm a help desk for Perl, so cut out my crap Revision ChangesPath 1.64 +4 -8 apache-site/contributors/index.html Index: index.html === RCS file: /export/home/cvs/apache-site/contributors/index.html,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- index.html1999/01/26 07:03:08 1.63 +++ index.html1999/02/01 17:51:22 1.64 @@ -65,7 +65,7 @@ TDSCO and QNX porting, Apache-SSL author, pedant. TR VALIGN=TOP TDSTRONGA HREF=#dougmDoug MacEachern/A/STRONG - TDPerl whacker and DCE slinger + TD TR VALIGN=TOP TDSTRONGA HREF=#mirzadehAram W. Mirzadeh/A/STRONG TDLinux SCO porting. @@ -366,15 +366,11 @@ P STRONGName:/STRONG A NAME=dougmDoug MacEachern/ABR -STRONGemail:/STRONG A HREF=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/ABR +STRONGemail:/STRONG [EMAIL PROTECTED]BR STRONGOccupation:/STRONG Freelance Consultant BR -STRONGLocation:/STRONG Summer Seasons, Earth BR -STRONGComment:/STRONG Yes, it can be done with PerlBR +STRONGLocation:/STRONG Boston, MA, USA. BR STRONGContributions:/STRONG A HREF=http://perl.apache.org/;mod_perl/A, -plugin-ability for transport mechanisms such as DCE RPC, -sfio support, various API additions, mod_perl/mod_include integration, -dbmmanage overhaul - +various API additions P STRONGName:/STRONG A NAME=mirzadehAram W. Mirzadeh/ABR
cvs commit: apache-1.3 STATUS
dougm 98/12/30 13:37:36 Modified:.STATUS Log: record configure troubles Revision ChangesPath 1.575 +7 -1 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.574 retrieving revision 1.575 diff -u -r1.574 -r1.575 --- STATUS1998/12/30 00:40:40 1.574 +++ STATUS1998/12/30 21:37:35 1.575 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1998/12/30 00:40:40 $] + Last modified at [$Date: 1998/12/30 21:37:35 $] Release: @@ -16,6 +16,12 @@ 2.0 : In pre-alpha development, see apache-2.0 repository RELEASE SHOWSTOPPERS: + +* configure breakage + mod_perl build is broken (CFLAGS not picked up from libperl.module) + other oddities: + (under linux) ./configure: [: too many arguments + (under solaris) ./configure: test: unknown operator --enable-module=unique_id * Version component misbehaviour See: [EMAIL PROTECTED]
cvs commit: apache-1.3 STATUS
dougm 98/12/30 15:40:22 Modified:.STATUS Log: oddities were fixed by Ralf Revision ChangesPath 1.576 +1 -4 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.575 retrieving revision 1.576 diff -u -r1.575 -r1.576 --- STATUS1998/12/30 21:37:35 1.575 +++ STATUS1998/12/30 23:40:21 1.576 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1998/12/30 21:37:35 $] + Last modified at [$Date: 1998/12/30 23:40:21 $] Release: @@ -19,9 +19,6 @@ * configure breakage mod_perl build is broken (CFLAGS not picked up from libperl.module) - other oddities: - (under linux) ./configure: [: too many arguments - (under solaris) ./configure: test: unknown operator --enable-module=unique_id * Version component misbehaviour See: [EMAIL PROTECTED]
cvs commit: apache-1.3/src/modules/standard mod_include.c
dougm 98/11/30 14:26:49
Modified:src CHANGES
src/modules/standard mod_include.c
Log:
mod_include.c:handle_perl() now properly tests for OPT_INCNOEXEC
rather than OPT_INCLUDES
Submitted by: Rainer Schoepf [EMAIL PROTECTED]
Reviewed by: Doug MacEachern
Revision ChangesPath
1.1152+2 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1151
retrieving revision 1.1152
diff -u -r1.1151 -r1.1152
--- CHANGES 1998/11/25 04:36:10 1.1151
+++ CHANGES 1998/11/30 22:26:47 1.1152
@@ -1,4 +1,6 @@
Changes with Apache 1.3.4
+ *) mod_include.c:handle_perl() now properly tests for OPT_INCNOEXEC
+ rather than OPT_INCLUDES [Rainer Schoepf [EMAIL PROTECTED]]
*) ap_md5_binary() was using sprintf() rather than a table lookup
to convert binary bytes to hex digits.
1.107 +1 -1 apache-1.3/src/modules/standard/mod_include.c
Index: mod_include.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_include.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- mod_include.c 1998/11/09 07:03:19 1.106
+++ mod_include.c 1998/11/30 22:26:49 1.107
@@ -952,7 +952,7 @@
SV *sub = Nullsv;
AV *av = newAV();
-if (!(ap_allow_options(r) OPT_INCLUDES)) {
+if (ap_allow_options(r) OPT_INCNOEXEC) {
ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
httpd: #perl SSI disallowed by IncludesNoExec in %s,
r-filename);
cvs commit: apache-1.3/src/main http_core.c
dougm 98/11/20 13:17:30
Modified:.STATUS
src CHANGES
src/include ap_mmn.h http_core.h
src/main http_core.c
Log:
ap_exists_config_define() function is now public
Submitted by: Doug MacEachern
Reviewed by: Jim, Ben Hyde
Revision ChangesPath
1.543 +0 -4 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.542
retrieving revision 1.543
diff -u -r1.542 -r1.543
--- STATUS1998/11/19 17:46:40 1.542
+++ STATUS1998/11/20 21:17:20 1.543
@@ -318,10 +318,6 @@
PR #1120
Brian: +1
-* un-static-ize ap_exists_config_define() in http_core.c for
- everybody to use
- Doug: +1
-
Win32 specific issues:
Important
1.1149+2 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1148
retrieving revision 1.1149
diff -u -r1.1148 -r1.1149
--- CHANGES 1998/11/18 09:15:25 1.1148
+++ CHANGES 1998/11/20 21:17:21 1.1149
@@ -1,5 +1,7 @@
Changes with Apache 1.3.4
+ *) ap_exists_config_define() function is now public
+
*) Fix documentation of `Action' directive: It can activate a CGI script
when either a handler or a MIME content type is triggered by the
request.
[Andrew Pimlott [EMAIL PROTECTED]] PR#3340
1.11 +3 -1 apache-1.3/src/include/ap_mmn.h
Index: ap_mmn.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/ap_mmn.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ap_mmn.h 1998/11/08 09:51:09 1.10
+++ ap_mmn.h 1998/11/20 21:17:25 1.11
@@ -183,12 +183,14 @@
* 19980917 (1.3.2-dev) - bs2000: changed os_set_authfile() to
os_set_account()
* 19981108 (1.3.4-dev) - added ap_method_number_of()
* - changed value of M_INVALID and added WebDAV methods
+ * 19981108.1 - ap_exists_config_define() is now public (minor
bump)
+ *
*/
#ifndef MODULE_MAGIC_NUMBER_MAJOR
#define MODULE_MAGIC_NUMBER_MAJOR 19981108
#endif
-#define MODULE_MAGIC_NUMBER_MINOR 0 /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 1 /* 0...n */
#define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR/* backward
compat */
/* Useful for testing for features. */
1.51 +1 -0 apache-1.3/src/include/http_core.h
Index: http_core.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/http_core.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- http_core.h 1998/10/16 07:04:45 1.50
+++ http_core.h 1998/11/20 21:17:26 1.51
@@ -133,6 +133,7 @@
API_EXPORT(unsigned) ap_get_server_port(const request_rec *r);
API_EXPORT(unsigned long) ap_get_limit_req_body(const request_rec *r);
API_EXPORT(void) ap_custom_response(request_rec *r, int status, char
*string);
+API_EXPORT(int) ap_exists_config_define(char *name);
/* Authentication stuff. This is one of the places where compatibility
* with the old config files *really* hurts; they don't discriminate at
1.241 +1 -1 apache-1.3/src/main/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- http_core.c 1998/11/14 00:35:54 1.240
+++ http_core.c 1998/11/20 21:17:28 1.241
@@ -1421,7 +1421,7 @@
return NULL;
}
-static int ap_exists_config_define(char *name)
+API_EXPORT(int) ap_exists_config_define(char *name)
{
char **defines;
int i;
cvs commit: apache-1.3 STATUS
dougm 98/11/19 09:46:41 Modified:.STATUS Log: un-static-ize ap_exists_config_define? Revision ChangesPath 1.542 +4 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.541 retrieving revision 1.542 diff -u -r1.541 -r1.542 --- STATUS1998/11/15 18:32:25 1.541 +++ STATUS1998/11/19 17:46:40 1.542 @@ -318,6 +318,10 @@ PR #1120 Brian: +1 +* un-static-ize ap_exists_config_define() in http_core.c for + everybody to use + Doug: +1 + Win32 specific issues: Important
cvs commit: apache-1.3/src/modules/standard mod_include.c
dougm 98/09/24 07:06:42 Modified:src CHANGES src/modules/standard mod_include.c Log: The Perl %ENV hash will now be setup by default when using the mod_include `perl' command Revision ChangesPath 1.1076+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1075 retrieving revision 1.1076 diff -u -r1.1075 -r1.1076 --- CHANGES 1998/09/24 10:21:58 1.1075 +++ CHANGES 1998/09/24 14:06:40 1.1076 @@ -1,5 +1,8 @@ Changes with Apache 1.3.3 + *) The Perl %ENV hash will now be setup by default when using the + mod_include `perl' command [Doug MacEachern] + *) PORT: Add Pyramid DC/OSx support to configuration mechanism. [Earle Ake [EMAIL PROTECTED]] 1.105 +1 -0 apache-1.3/src/modules/standard/mod_include.c Index: mod_include.c === RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_include.c,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- mod_include.c 1998/09/07 03:42:03 1.104 +++ mod_include.c 1998/09/24 14:06:42 1.105 @@ -946,6 +946,7 @@ } } perl_stdout2client(r); +perl_setup_env(r); perl_call_handler(sub, r, av); return OK; }
cvs commit: apache-1.3/src/main http_config.c
dougm 98/09/19 14:54:58
Modified:.STATUS
src CHANGES
src/main http_config.c
Log:
Fix bug in ap_remove_module(), which caused problems for dso's
who were the top_module.
Reviewed by: Dean Gaudet, Marc Slemko
Revision ChangesPath
1.479 +0 -14 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.478
retrieving revision 1.479
diff -u -r1.478 -r1.479
--- STATUS1998/09/19 15:29:10 1.478
+++ STATUS1998/09/19 21:54:54 1.479
@@ -74,20 +74,6 @@
* Patches for the DSO/mod_perl problem (see below for description):
- Doug MacEachern's [PATCH] fix for dso/mod_perl
- [EMAIL PROTECTED]
- Status: Ralf -0 because it still doesn't work for me under FreeBSD.
- We really have to find the real reason now. It's horrible
- that only mod_perl is broken under DSO while other
- module work. I really want to see mod_perl working
- with DSO
-
- Doug says: this patch only cured Solaris, under linux and irix
- the brokeness remains, but is a core dump in dlclose() of the
- perl_module.dynamic_load_handle
- comment out mod_so.c:register_cleanup()-unload_module()
- and mod_perl's 'make test' passes 100%
-
Ralf's [PATCH] Fix module init
This fixes the mod_so/mod_perl problems described under FINAL RELEASE
SHOWSTOPPERS by doing a more correct init of the modules after loading
1.1070+3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1069
retrieving revision 1.1070
diff -u -r1.1069 -r1.1070
--- CHANGES 1998/09/19 12:12:34 1.1069
+++ CHANGES 1998/09/19 21:54:55 1.1070
@@ -1,5 +1,8 @@
Changes with Apache 1.3.2
+ *) Fix bug in ap_remove_module(), which caused problems for dso's
+ who were the top_module. [Doug MacEachern]
+
*) Add support for Berkeley-DB/2.x (in addition to Berkeley-DB/1.x) to
mod_auth_db to both be friendly to users who wants to use this version
and to avoid problems under platforms where only version 2.x is present.
1.127 +1 -0 apache-1.3/src/main/http_config.c
Index: http_config.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_config.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- http_config.c 1998/09/03 18:01:43 1.126
+++ http_config.c 1998/09/19 21:54:57 1.127
@@ -598,6 +598,7 @@
if (modp == m) {
/* We are the top module, special case */
top_module = modp-next;
+ m-next = NULL;
}
else {
/* Not the top module, find use. When found modp will
cvs commit: apache-1.3 STATUS
dougm 98/09/11 09:35:08 Modified:.STATUS Log: a +1 for Ken's error-notes/ap_log_error patch notes on mod_perl/dso problem Revision ChangesPath 1.464 +7 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.463 retrieving revision 1.464 diff -u -r1.463 -r1.464 --- STATUS1998/09/10 17:45:05 1.463 +++ STATUS1998/09/11 16:35:07 1.464 @@ -62,7 +62,7 @@ Avoids special-casing the setting everywhere, and allows sensitive error_log-only messages to be kept out of *ERROR_NOTES. Message-ID: [EMAIL PROTECTED] - Status: Ken +1 + Status: Ken +1, Doug +1 * Patches for the DSO/mod_perl problem (see below for description): @@ -73,6 +73,12 @@ that only mod_perl is broken under DSO while other module work. I really want to see mod_perl working with DSO + + Doug says: this patch only cured Solaris, under linux and irix + the brokeness remains, but is a core dump in dlclose() of the + perl_module.dynamic_load_handle + comment out mod_so.c:register_cleanup()-unload_module() + and mod_perl's 'make test' passes 100% Ralf's [PATCH] Fix module init This fixes the mod_so/mod_perl problems described under FINAL RELEASE
cvs commit: apache-1.3/src/main http_core.c http_main.c
dougm 98/08/26 13:01:26
Modified:src CHANGES
src/include http_core.h
src/main http_core.c http_main.c
Log:
new `GprofDir' directive when compiled with -DGPROF, where gprof can
plop gmon.out profile data for each child
Submitted by: Doug MacEachern
Reviewed by: Dean Gaudet
Revision ChangesPath
1.1037+3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1036
retrieving revision 1.1037
diff -u -r1.1036 -r1.1037
--- CHANGES 1998/08/25 10:51:49 1.1036
+++ CHANGES 1998/08/26 20:01:19 1.1037
@@ -1,5 +1,8 @@
Changes with Apache 1.3.2
+ *) new `GprofDir' directive when compiled with -DGPROF, where gprof can
+ plop gmon.out profile data for each child [Doug MacEachern]
+
*) Use the construct ``$@'' instead of ``$*'' in the generated
config.status script to be immune against arguments with whitespaces.
[Yves Arrouye [EMAIL PROTECTED]] PR#2866
1.48 +4 -0 apache-1.3/src/include/http_core.h
Index: http_core.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/http_core.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- http_core.h 1998/08/10 04:16:13 1.47
+++ http_core.h 1998/08/26 20:01:21 1.48
@@ -253,6 +253,10 @@
typedef struct {
+#ifdef GPROF
+char *gprof_dir;
+#endif
+
/* Name translations --- we want the core to be able to do *something*
* so it's at least a minimally functional web server on its own (and
* can be tested that way). But let's keep it to the bare minimum:
1.225 +24 -0 apache-1.3/src/main/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- http_core.c 1998/08/11 15:37:52 1.224
+++ http_core.c 1998/08/26 20:01:22 1.225
@@ -271,6 +271,9 @@
int is_virtual = s-is_virtual;
conf = (core_server_config *)ap_pcalloc(a, sizeof(core_server_config));
+#ifdef GPROF
+conf-gprof_dir = NULL;
+#endif
conf-access_name = is_virtual ? NULL : DEFAULT_ACCESS_FNAME;
conf-ap_document_root = is_virtual ? NULL : DOCUMENT_LOCATION;
conf-sec = ap_make_array(a, 40, sizeof(void *));
@@ -793,6 +796,23 @@
return NULL;
}
+#ifdef GPROF
+static const char *set_gprof_dir(cmd_parms *cmd, void *dummy, char *arg)
+{
+void *sconf = cmd-server-module_config;
+core_server_config *conf = ap_get_module_config(sconf, core_module);
+
+const char *err = ap_check_cmd_context(cmd,
+NOT_IN_DIR_LOC_FILE|NOT_IN_LIMIT);
+if (err != NULL) {
+return err;
+}
+
+conf-gprof_dir = ap_pstrdup(cmd-pool, arg);
+return NULL;
+}
+#endif /*GPROF*/
+
static const char *set_document_root(cmd_parms *cmd, void *dummy, char *arg)
{
void *sconf = cmd-server-module_config;
@@ -2458,6 +2478,10 @@
Selects which authenticated users or groups may access a protected space
},
{ Satisfy, satisfy, NULL, OR_AUTHCFG, TAKE1,
access policy if both allow and require used ('all' or 'any') },
+#ifdef GPROF
+{ GprofDir, set_gprof_dir, NULL, RSRC_CONF, TAKE1,
+ Directory to plop gmon.out files },
+#endif
/* Old resource config file commands */
1.388 +37 -0 apache-1.3/src/main/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -r1.387 -r1.388
--- http_main.c 1998/08/13 01:55:06 1.387
+++ http_main.c 1998/08/26 20:01:22 1.388
@@ -414,6 +414,42 @@
static APACHE_TLS int volatile exit_after_unblock = 0;
+#ifdef GPROF
+/*
+ * change directory for gprof to plop the gmon.out file
+ * configure in httpd.conf:
+ * GprofDir logs/ - $ServerRoot/logs/gmon.out
+ * GprofDir logs/% - $ServerRoot/logs/gprof.$pid/gmon.out
+ */
+static void chdir_for_gprof()
+{
+core_server_config *sconf =
+ ap_get_module_config(server_conf-module_config, core_module);
+char *dir = sconf-gprof_dir;
+
+if(dir) {
+ char buf[512];
+ int len = strlen(sconf-gprof_dir) - 1;
+ if(*(dir + len) == '%') {
+ dir[len] = '\0';
+ ap_snprintf(buf, sizeof(buf), %sgprof.%d, dir, (int)getpid());
+ }
+ dir = ap_server_root_relative(pconf, buf[0
cvs commit: apache-devsite mmn.txt
dougm 98/08/06 11:59:24 Modified:.mmn.txt Log: add ap_scan_script_header_err_core() Revision ChangesPath 1.29 +1 -0 apache-devsite/mmn.txt Index: mmn.txt === RCS file: /export/home/cvs/apache-devsite/mmn.txt,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- mmn.txt 1998/08/06 17:32:37 1.28 +++ mmn.txt 1998/08/06 18:59:24 1.29 @@ -78,3 +78,4 @@ 4. compat.h- ap_compat.h 5. apctype.h - ap_ctype.h 19980806 (1.3.2-dev) - add ap_log_rerror() + - add ap_scan_script_header_err_core()
cvs commit: apache-1.3/src/main util.c
dougm 98/08/06 12:13:55
Modified:src CHANGES
src/include httpd.h
src/main util.c
Log:
API: new ap_uuencode() function
Reviewed by: Ralf, Dean
Revision ChangesPath
1.1007+2 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1006
retrieving revision 1.1007
diff -u -r1.1006 -r1.1007
--- CHANGES 1998/08/06 18:58:16 1.1006
+++ CHANGES 1998/08/06 19:13:50 1.1007
@@ -1,5 +1,7 @@
Changes with Apache 1.3.2
+ *) API: new ap_uuencode() function [Doug MacEachern]
+
*) API: scan_script_header_err_core() now public and renamed
ap_scan_script_header_err_core() [Doug MacEachern]
1.230 +1 -0 apache-1.3/src/include/httpd.h
Index: httpd.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -r1.229 -r1.230
--- httpd.h 1998/08/03 09:14:48 1.229
+++ httpd.h 1998/08/06 19:13:52 1.230
@@ -889,6 +889,7 @@
API_EXPORT(int) ap_strcmp_match(const char *str, const char *exp);
API_EXPORT(int) ap_strcasecmp_match(const char *str, const char *exp);
API_EXPORT(char *) ap_uudecode(pool *, const char *);
+API_EXPORT(char *) ap_uuencode(pool *p, char *string);
#ifdef OS2
void os2pathname(char *path);
#endif
1.130 +22 -0 apache-1.3/src/main/util.c
Index: util.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/util.c,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- util.c1998/08/06 01:09:30 1.129
+++ util.c1998/08/06 19:13:53 1.130
@@ -1726,6 +1726,28 @@
return bufplain;
}
+static const char basis_64[] =
+ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/;
+
+API_EXPORT(char *) ap_uuencode(pool *a, char *string)
+{
+int i, len = strlen(string);
+char *p;
+char *encoded = (char *) ap_pcalloc(a, (len+2) / 3 * 4);
+
+p = encoded;
+for (i = 0; i len; i += 3) {
+*p++ = basis_64[string[i] 2];
+*p++ = basis_64[((string[i] 0x3) 4) | ((int) (string[i + 1]
0xF0) 4)];
+*p++ = basis_64[((string[i + 1] 0xF) 2) | ((int) (string[i + 2]
0xC0) 6)];
+*p++ = basis_64[string[i + 2] 0x3F];
+}
+*p-- = '\0';
+*p-- = '=';
+*p-- = '=';
+return encoded;
+}
+
#ifdef OS2
void os2pathname(char *path)
{
cvs commit: apache-devsite mmn.txt
dougm 98/08/06 12:24:49 Modified:.mmn.txt Log: add ap_custom_response() Revision ChangesPath 1.31 +2 -1 apache-devsite/mmn.txt Index: mmn.txt === RCS file: /export/home/cvs/apache-devsite/mmn.txt,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- mmn.txt 1998/08/06 19:14:36 1.30 +++ mmn.txt 1998/08/06 19:24:47 1.31 @@ -79,4 +79,5 @@ 5. apctype.h - ap_ctype.h 19980806 (1.3.2-dev) - add ap_log_rerror() - add ap_scan_script_header_err_core() - - add ap_uuencode() \ No newline at end of file + - add ap_uuencode() + - add ap_custom_response() \ No newline at end of file
cvs commit: apache-1.3/src/modules/standard mod_include.c
dougm 98/06/30 18:37:31
Modified:.STATUS
src CHANGES
src/include hsregex.h
src/modules/standard mod_include.c
Log:
add support for #perl arg interpolation in mod_include
Submitted by: Doug MacEachern
Reviewed by: Dean Gaudet, Howard Fear
Revision ChangesPath
1.434 +1 -5 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.433
retrieving revision 1.434
diff -u -r1.433 -r1.434
--- STATUS1998/06/30 08:09:13 1.433
+++ STATUS1998/07/01 01:37:26 1.434
@@ -22,7 +22,7 @@
situation it runs fine. Sure, its mod_perl's fault because its mod_perl
code which returns DECLINED. But it definitely seems to be caused by a
missing init in mod_so under DSO situation. I've already asked Doug for
- hints but he still has no clue.
+ hints but he has not had a chance to look into it.
Currently at least mod_perl is broken under the DSO situation because
of
this missing init in mod_so. But perhaps there are more modules which
@@ -48,10 +48,6 @@
* Filenames containing whitespace characters caused problems for
directives
Bill Stoddard [EMAIL PROTECTED]
Message-ID: [EMAIL PROTECTED]
-
-* Fix mod_include #perl arg interpolation
- Doug MacEachern [EMAIL PROTECTED]
- Message-Id: [EMAIL PROTECTED]
* PR#2483 reports that RewriteMap program still don't work under Win32
because
of a SIGSEGV. The reporter is right, ap_spawn_child_core() calls the
child
1.942 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.941
retrieving revision 1.942
diff -u -r1.941 -r1.942
--- CHANGES 1998/06/30 08:08:33 1.941
+++ CHANGES 1998/07/01 01:37:27 1.942
@@ -1,5 +1,8 @@
Changes with Apache 1.3.1
+ *) add support for #perl arg interpolation in mod_include
+ [Doug MacEachern]
+
*) API: Name changes of table_elts to ap_table_elts and is_table_empty
to ap_is_table_empty. [Ben Laurie]
1.6 +0 -2 apache-1.3/src/include/hsregex.h
Index: hsregex.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/hsregex.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hsregex.h 1998/04/06 05:21:41 1.5
+++ hsregex.h 1998/07/01 01:37:29 1.6
@@ -6,12 +6,10 @@
#endif
/* === regex2.h === */
-#ifndef API_EXPORT
#ifdef WIN32
#define API_EXPORT(type)__declspec(dllexport) type __stdcall
#else
#define API_EXPORT(type)type
-#endif
#endif
typedef off_t regoff_t;
1.97 +3 -1 apache-1.3/src/modules/standard/mod_include.c
Index: mod_include.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_include.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- mod_include.c 1998/06/27 18:09:32 1.96
+++ mod_include.c 1998/07/01 01:37:29 1.97
@@ -918,6 +918,7 @@
static int handle_perl(FILE *in, request_rec *r, const char *error)
{
char tag[MAX_STRING_LEN];
+char parsed_string[MAX_STRING_LEN];
char *tag_val;
SV *sub = Nullsv;
AV *av = newAV();
@@ -936,7 +937,8 @@
sub = newSVpv(tag_val, 0);
}
else if (strnEQ(tag, arg, 3)) {
-av_push(av, newSVpv(tag_val, 0));
+parse_string(r, tag_val, parsed_string, sizeof(parsed_string),
0);
+av_push(av, newSVpv(parsed_string, 0));
}
else if (strnEQ(tag, done, 4)) {
break;
cvs commit: apache-1.3/src/include hsregex.h
dougm 98/06/30 18:45:25 Modified:src/include hsregex.h Log: backout from last commit. (no idea how that happened, I did cvs update -dP before any changes) Revision ChangesPath 1.7 +2 -0 apache-1.3/src/include/hsregex.h Index: hsregex.h === RCS file: /export/home/cvs/apache-1.3/src/include/hsregex.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- hsregex.h 1998/07/01 01:37:29 1.6 +++ hsregex.h 1998/07/01 01:45:25 1.7 @@ -6,10 +6,12 @@ #endif /* === regex2.h === */ +#ifndef API_EXPORT #ifdef WIN32 #define API_EXPORT(type)__declspec(dllexport) type __stdcall #else #define API_EXPORT(type)type +#endif #endif typedef off_t regoff_t;
cvs commit: apache-1.3 ABOUT_APACHE
dougm 98/05/18 18:43:45 Modified:.ABOUT_APACHE Log: update my way out-of-date info Revision ChangesPath 1.17 +1 -1 apache-1.3/ABOUT_APACHE Index: ABOUT_APACHE === RCS file: /export/home/cvs/apache-1.3/ABOUT_APACHE,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ABOUT_APACHE 1998/04/25 08:49:41 1.16 +++ ABOUT_APACHE 1998/05/19 01:43:44 1.17 @@ -79,7 +79,7 @@ Alexei Kosut Stanford University, California Martin Kraemer Munich, Germany Ben Laurie Freelance Consultant, UK - Doug MacEachernTOG Research Institute, Massachusetts + Doug MacEachernFreelance Consultant, Summer Seasons, Earth Aram W. Mirzadeh Qosina Corporation, New York Sameer Parekh C2Net, California Marc SlemkoCanada
cvs commit: apache-1.2 ABOUT_APACHE
dougm 98/05/18 18:45:20 Modified:.ABOUT_APACHE Log: ditto Revision ChangesPath 1.4 +1 -1 apache-1.2/ABOUT_APACHE Index: ABOUT_APACHE === RCS file: /export/home/cvs/apache-1.2/ABOUT_APACHE,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ABOUT_APACHE 1998/04/14 15:55:35 1.3 +++ ABOUT_APACHE 1998/05/19 01:45:19 1.4 @@ -79,7 +79,7 @@ Alexei Kosut Stanford University, California Martin Kraemer Munich, Germany Ben Laurie Freelance Consultant, UK - Doug MacEachernTOG Research Institute, Massachusetts + Doug MacEachernFreelance Consultant, Summer Seasons, Earth Aram W. Mirzadeh Qosina Corporation, New York Sameer Parekh C2Net, California Paul SuttonC2Net Europe, UK
cvs commit: apache-1.3/src/main http_core.c
dougm 98/05/07 15:42:06
Modified:src/main http_core.c
Log:
`bool' is #define'd as a type here, can't build with that clash,
so change to `flag'
Revision ChangesPath
1.195 +2 -2 apache-1.3/src/main/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- http_core.c 1998/05/07 12:24:25 1.194
+++ http_core.c 1998/05/07 22:42:05 1.195
@@ -1892,9 +1892,9 @@
*/
static const char *enable_platform_announcement(cmd_parms *cmd, void
*mconfig,
- int bool)
+ int flag)
{
-ap_note_platform = bool;
+ap_note_platform = flag;
return NULL;
}
cvs commit: apache-1.3/src/main http_protocol.c
dougm 98/03/24 15:20:28
Modified:src/main http_protocol.c
Log:
oops, this didn't commited yesterday for the API_EXPORT of index_of_response
Submitted by: Doug MacEachern
Revision ChangesPath
1.201 +1 -1 apache-1.3/src/main/http_protocol.c
Index: http_protocol.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_protocol.c,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- http_protocol.c 1998/03/17 08:21:01 1.200
+++ http_protocol.c 1998/03/24 23:20:26 1.201
@@ -968,7 +968,7 @@
* If that sad event occurs, replace the code below with a linear search
* from status_lines[shortcut[i]] to status_lines[shortcut[i+1]-1];
*/
-int index_of_response(int status)
+API_EXPORT(int) index_of_response(int status)
{
static int shortcut[6] = {0, LEVEL_200, LEVEL_300, LEVEL_400,
LEVEL_500, RESPONSE_CODES};
cvs commit: apache-1.3/src/main http_config.c http_core.c
dougm 98/03/16 19:26:46
Modified:src/include http_config.h http_core.h
src/main http_config.c http_core.c
Log:
export a few functions so mod_perl's Perl config sections work under win32
Submitted by: Doug MacEachern
Reviewed by: Dean Gaudet
Revision ChangesPath
1.74 +6 -4 apache-1.3/src/include/http_config.h
Index: http_config.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/http_config.h,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- http_config.h 1998/03/13 19:20:10 1.73
+++ http_config.h 1998/03/17 03:26:41 1.74
@@ -267,7 +267,7 @@
* handle it back-compatibly, or at least signal an error).
*/
-#define MODULE_MAGIC_NUMBER 19980312
+#define MODULE_MAGIC_NUMBER 19980317
#define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL, NULL
/* Generic accessors for other modules to get at their own module-specific
@@ -302,6 +302,8 @@
#ifdef CORE_PRIVATE
+extern API_VAR_EXPORT module *top_module;
+
extern module *prelinked_modules[];
extern module *preloaded_modules[];
@@ -318,7 +320,7 @@
/* For http_request.c... */
void *create_request_config(pool *p);
-void *create_per_dir_config(pool *p);
+API_EXPORT(void *) create_per_dir_config(pool *p);
void *merge_per_dir_configs(pool *p, void *base, void *new);
void *create_empty_config(pool *p);
@@ -328,9 +330,9 @@
int parse_htaccess(void **result, request_rec *r, int override,
const char *path, const char *access_name);
-const char *srm_command_loop(cmd_parms *parms, void *config);
+API_EXPORT(const char *) srm_command_loop(cmd_parms *parms, void *config);
-const char *init_virtual_host(pool *p, const char *hostname,
+API_EXPORT(const char *) init_virtual_host(pool *p, const char *hostname,
server_rec *main_server, server_rec **);
void process_resource_config(server_rec *s, char *fname, pool *p, pool
*ptemp);
1.37 +1 -1 apache-1.3/src/include/http_core.h
Index: http_core.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/http_core.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- http_core.h 1998/02/21 01:42:36 1.36
+++ http_core.h 1998/03/17 03:26:42 1.37
@@ -132,7 +132,7 @@
char *response_code_string (request_rec *r, int error_index);
-extern module core_module;
+extern API_VAR_EXPORT module core_module;
/* Per-directory configuration */
1.107 +7 -7 apache-1.3/src/main/http_config.c
Index: http_config.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_config.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- http_config.c 1998/03/16 12:09:52 1.106
+++ http_config.c 1998/03/17 03:26:44 1.107
@@ -94,7 +94,7 @@
* than DYNAMIC_MODULE_LIMIT.
*/
static int dynamic_modules = 0;
-module *top_module = NULL;
+API_VAR_EXPORT module *top_module = NULL;
typedef int (*handler_func) (request_rec *);
typedef void *(*dir_maker_func) (pool *, char *);
@@ -213,7 +213,7 @@
return create_empty_config(p);
}
-void *create_per_dir_config(pool *p)
+API_EXPORT(void *) create_per_dir_config(pool *p)
{
return create_empty_config(p);
}
@@ -861,7 +861,7 @@
}
}
-const command_rec *find_command(const char *name, const command_rec *cmds)
+API_EXPORT(const command_rec *) find_command(const char *name, const
command_rec *cmds)
{
while (cmds-name)
if (!strcasecmp(name, cmds-name))
@@ -872,7 +872,7 @@
return NULL;
}
-const command_rec *find_command_in_modules(const char *cmd_name, module
**mod)
+API_EXPORT(const command_rec *) find_command_in_modules(const char
*cmd_name, module **mod)
{
const command_rec *cmdp;
module *modp;
@@ -886,7 +886,7 @@
return NULL;
}
-const char *handle_command(cmd_parms *parms, void *config, const char *l)
+API_EXPORT(const char *) handle_command(cmd_parms *parms, void *config,
const char *l)
{
const char *args, *cmd_name, *retval;
const command_rec *cmd;
@@ -931,7 +931,7 @@
return retval;
}
-const char *srm_command_loop(cmd_parms *parms, void *config)
+API_EXPORT(const char *) srm_command_loop(cmd_parms *parms, void *config)
{
char l[MAX_STRING_LEN];
@@ -1201,7 +1201,7 @@
}
-const char *init_virtual_host(pool *p, const char *hostname,
+API_EXPORT(const char *) init_virtual_host(pool *p, const char *hostname,
server_rec
cvs commit: apache-devsite mmn.txt
dougm 98/03/16 19:29:34 Modified:.mmn.txt Log: bump for new API_EXPORTs Revision ChangesPath 1.14 +1 -0 apache-devsite/mmn.txt Index: mmn.txt === RCS file: /export/home/cvs/apache-devsite/mmn.txt,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- mmn.txt 1998/03/12 10:36:38 1.13 +++ mmn.txt 1998/03/17 03:29:33 1.14 @@ -43,3 +43,4 @@ content_languages MUST all be lowercase strings, and MAY NOT be modified in place -- modifications require pstrdup(). +19980317 (1.3b6-dev) - API_EXPORTS for win32 and Perl
cvs commit: apache-1.3 STATUS
dougm 98/03/14 23:02:56 Modified:.STATUS Log: Perl and win32 Revision ChangesPath 1.190 +3 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.189 retrieving revision 1.190 diff -u -r1.189 -r1.190 --- STATUS1998/03/14 12:22:03 1.189 +++ STATUS1998/03/15 07:02:55 1.190 @@ -123,6 +123,9 @@ * Ken's IndexFormat enhancement to mod_autoindex to allow CustomLog-like tailoring of directory listing formats +* Doug's attempt to get mod_perl's Perl config working under win32, + some non-public functions and structures need to exposed + Needs patch: * Dean's locale project
cvs commit: apache-1.3 STATUS
dougm 98/02/17 17:28:05 Modified:.STATUS Log: added: Doug's [PATCH] unbind cpu option for aix Revision ChangesPath 1.154 +4 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.153 retrieving revision 1.154 diff -u -r1.153 -r1.154 --- STATUS1998/02/14 13:17:53 1.153 +++ STATUS1998/02/18 01:28:04 1.154 @@ -37,6 +37,10 @@ [EMAIL PROTECTED] Status (for 1.3b6-dev): Ralf +1 +* Doug's [PATCH] unbind cpu option for aix + [EMAIL PROTECTED] + Status: Doug +1 + Concepts: * Jim's [CONCEPT] platform.h header file. Instead of lumping
cvs commit: apache-1.3/src/main http_main.c
dougm 98/02/18 14:41:54
Modified:.STATUS
src CHANGES
src/main http_main.c
Log:
fix aix processor affinity
Submitted by: Doug MacEachern
Reviewed by: Dean, Jim, Martin
Revision ChangesPath
1.158 +0 -4 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- STATUS1998/02/18 20:39:19 1.157
+++ STATUS1998/02/18 22:41:49 1.158
@@ -38,10 +38,6 @@
[EMAIL PROTECTED]
Status: Ralf +1, Martin +1
-* Doug's [PATCH] unbind cpu option for aix
- [EMAIL PROTECTED]
- Status: Doug +1, Jim +1, Martin +1
-
Concepts:
* Dean's [PRE-PATCH] expanding ap_snprintf()
1.639 +5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.638
retrieving revision 1.639
diff -u -r1.638 -r1.639
--- CHANGES 1998/02/18 20:52:51 1.638
+++ CHANGES 1998/02/18 22:41:50 1.639
@@ -1,5 +1,10 @@
Changes with Apache 1.3b6
+ *) By default AIX binds a process (and it's children) to a single
+ processor. httpd children now unbind themselves from that cpu
+ and re-bind to one selected at random via bindprocessor()
+ [Doug MacEachern]
+
*) Linux 2.0 and above implement RLIMIT_AS, RLIMIT_DATA has almost no
effect. Work around it by using RLIMIT_AS for the RLimitMEM
directive. [Enrik Berkhan [EMAIL PROTECTED]] PR#1816
1.292 +12 -0 apache-1.3/src/main/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -r1.291 -r1.292
--- http_main.c 1998/02/17 11:28:28 1.291
+++ http_main.c 1998/02/18 22:41:53 1.292
@@ -3312,6 +3312,18 @@
}
if (!pid) {
+#ifdef AIX
+/* by default AIX binds to a single processor
+ * this bit unbinds children which will then bind to another cpu
+ */
+#include sys/processor.h
+ int status = bindprocessor(BINDPROCESS, (int)getpid(),
+PROCESSOR_CLASS_ANY);
+ if (status != OK) {
+ aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, server_conf,
+ processor unbind failed %d\n, status);
+ }
+#endif
RAISE_SIGSTOP(MAKE_CHILD);
MONCONTROL(1);
/* Disable the restart signal handlers and enable the just_die stuff.
cvs commit: apachen STATUS
dougm 98/01/10 16:58:15 Modified:.STATUS Log: update message id and add Ben's vote Revision ChangesPath 1.68 +3 -3 apachen/STATUS Index: STATUS === RCS file: /export/home/cvs/apachen/STATUS,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- STATUS1998/01/10 21:40:06 1.67 +++ STATUS1998/01/11 00:58:14 1.68 @@ -89,13 +89,13 @@ [EMAIL PROTECTED] Status: Dean +1, Jim +1, Martin +1 -* Doug's [PATCH] add -c and -C switches - [EMAIL PROTECTED] +* Doug's [PATCH] add -c and -C switches (take 3) + [EMAIL PROTECTED] Doug, Randy and Jim were +1 on original -MApache::httpd_conf patch, which was recinded in favor of this patch prompted by ideas from Ben and Dean. Marc, Ken and Jim were also in favor of this over -M - Status: Doug +1, Martin +1 + Status: Doug +1, Martin +1, Ben +1 * Martin's [PATCH] Location within .htaccess? [EMAIL PROTECTED]
cvs commit: apachen STATUS
dougm 98/01/07 21:14:51 Modified:.STATUS Log: recind Doug's -MApache::httpd_conf add Doug's [PATCH] add -c and -C switches Revision ChangesPath 1.62 +7 -6 apachen/STATUS Index: STATUS === RCS file: /export/home/cvs/apachen/STATUS,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- STATUS1998/01/08 03:18:22 1.61 +++ STATUS1998/01/08 05:14:50 1.62 @@ -83,12 +83,13 @@ [EMAIL PROTECTED] Status: Dean +1, Jim +1, Martin +1 -* Doug's httpd -MApache::httpd_conf - [EMAIL PROTECTED] - Status: Doug +1, Randy +1, Dean would really prefer Ben's proposal - of httpd -M config file directive if it works. - Jim would prefer Ben's solution as well. - So would Ken (does it obviate -d and -f if present?) +* Doug's [PATCH] add -c and -C switches + [EMAIL PROTECTED] + Doug, Randy and Jim were +1 on original -MApache::httpd_conf + patch, which was recinded in favor of this patch prompted by + ideas from Ben and Dean. Marc, Ken and Jim were also in favor + of this over -M + Status: Doug +1, Martin +1 * Martin's [PATCH] Location within .htaccess? [EMAIL PROTECTED]
cvs commit: apachen/src/main http_config.h
dougm 97/10/28 14:38:47 Modified:src/main http_config.h Log: bump MODULE_MAGIC_NUMBER for Martin's new custom config stuff Submitted by: Doug MacEachern Revision ChangesPath 1.55 +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.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- http_config.h 1997/10/26 20:19:38 1.54 +++ http_config.h 1997/10/28 22:38:46 1.55 @@ -245,7 +245,7 @@ * handle it back-compatibly, or at least signal an error). */ -#define MODULE_MAGIC_NUMBER 19970912 +#define MODULE_MAGIC_NUMBER 19971026 #define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL /* Generic accessors for other modules to get at their own module-specific
cvs commit: apache-devsite mmn.txt
dougm 97/10/28 14:41:35 Modified:.mmn.txt Log: bumped for 1.3b3-dev's custom config hooks in place Submitted by: Doug MacEachern Revision ChangesPath 1.7 +3 -0 apache-devsite/mmn.txt Index: mmn.txt === RCS file: /export/home/cvs/apache-devsite/mmn.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mmn.txt 1997/09/12 20:47:22 1.6 +++ mmn.txt 1997/10/28 22:41:35 1.7 @@ -24,3 +24,6 @@ - piped_log API - short_score split into parent and child pieces - os_is_absolute_path + +19971026 (1.3b3-dev) - custom config hooks in place +
