cvs commit: apachen/src/modules/standard mod_rewrite.c
dgaudet 98/01/11 12:55:23
Modified:.STATUS
src CHANGES
src/main http_request.c util_script.c
src/modules/standard mod_rewrite.c
Log:
clean up some unneeded pstrdup()s in calls to table_* functions
Reviewed by: Marc Slemko, Paul Sutton, Ralf S. Engelschall
Revision ChangesPath
1.75 +1 -4 apachen/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apachen/STATUS,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- STATUS1998/01/11 20:24:57 1.74
+++ STATUS1998/01/11 20:55:15 1.75
@@ -76,12 +76,9 @@
* WIN32: fix CGI scripts called w/o '=' in path info PR#1591
* Doug's [PATCH] add -c and -C switches (take 3)
* Paul's WIN32: patch to allow for Doug's -c option
+* Dean's [PATCH] unneeded pstrdup()s (in table_*() calls)
Available Patches:
-
-* Dean's [PATCH] unneeded pstrdup()s (in table_*() calls)
- <[EMAIL PROTECTED]>
- Status: Dean +1
* Dean's [PATCH] MONCONTROL for profiling children
<[EMAIL PROTECTED]>
1.563 +4 -0 apachen/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.562
retrieving revision 1.563
diff -u -r1.562 -r1.563
--- CHANGES 1998/01/11 20:24:58 1.562
+++ CHANGES 1998/01/11 20:55:16 1.563
@@ -1,5 +1,9 @@
Changes with Apache 1.3b4
+ *) pstrdup() is implicit in calls to table_* functions, so there's
+ no need to do it before calling. Clean up a few cases.
+ [Marc Slemko, Dean Gaudet]
+
*) new -C and -c command line arguments
usage:
-C "directive" : process directive before reading config files
1.99 +1 -1 apachen/src/main/http_request.c
Index: http_request.c
===
RCS file: /export/home/cvs/apachen/src/main/http_request.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- http_request.c1998/01/08 03:56:08 1.98
+++ http_request.c1998/01/11 20:55:18 1.99
@@ -1217,7 +1217,7 @@
new->read_length = r->read_length; /* We can only read it once */
ap_snprintf(t, sizeof(t), "%d", r->status);
-table_set(new->subprocess_env, "REDIRECT_STATUS", pstrdup(r->pool, t));
+table_set(new->subprocess_env, "REDIRECT_STATUS", t);
/*
* XXX: hmm. This is because mod_setenvif and mod_unique_id really need
1.90 +1 -1 apachen/src/main/util_script.c
Index: util_script.c
===
RCS file: /export/home/cvs/apachen/src/main/util_script.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- util_script.c 1998/01/10 05:43:33 1.89
+++ util_script.c 1998/01/11 20:55:19 1.90
@@ -348,7 +348,7 @@
#ifdef WIN32
/* We need to make this a real Windows path name */
GetFullPathName(pt, HUGE_STRING_LEN, buffer, NULL);
- table_set(e, "PATH_TRANSLATED", pstrdup(r->pool, buffer));
+ table_set(e, "PATH_TRANSLATED", buffer);
#else
table_set(e, "PATH_TRANSLATED", pt);
#endif
1.59 +5 -8 apachen/src/modules/standard/mod_rewrite.c
Index: mod_rewrite.c
===
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_rewrite.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- mod_rewrite.c 1998/01/07 16:46:55 1.58
+++ mod_rewrite.c 1998/01/11 20:55:21 1.59
@@ -908,15 +908,13 @@
var = pstrcat(r->pool, "REDIRECT_", ENVVAR_SCRIPT_URL, NULL);
var = table_get(r->subprocess_env, var);
if (var == NULL)
- table_set(r->subprocess_env, ENVVAR_SCRIPT_URL,
- pstrdup(r->pool, r->uri));
+ table_set(r->subprocess_env, ENVVAR_SCRIPT_URL, r->uri);
else
- table_set(r->subprocess_env, ENVVAR_SCRIPT_URL,
- pstrdup(r->pool, var));
+ table_set(r->subprocess_env, ENVVAR_SCRIPT_URL, var);
}
else {
var = table_get(r->main->subprocess_env, ENVVAR_SCRIPT_URL);
- table_set(r->subprocess_env, ENVVAR_SCRIPT_URL, pstrdup(r->pool,
var));
+ table_set(r->subprocess_env, ENVVAR_SCRIPT_URL, var);
}
/*
@@ -945,7 +943,7 @@
#else
var = pstrcat(r->pool, "http://";, thisserver, thisport, thisurl, NULL);
#endif
-table_set(r->subprocess_env, ENVVAR_SCRIPT_URI, pstrdup(r->pool, var));
+table_set(r->sub
cvs commit: apachen/src/main http_conf_globals.h http_config.c http_main.c util.c
dougm 98/01/11 12:25:07
Modified:.STATUS
src CHANGES
src/main http_conf_globals.h http_config.c http_main.c
util.c
Log:
added Doug's [PATCH] add -c and -C switches (take 3)
added Paul's WIN32: patch to allow for Doug's -c option
Submitted by: Doug MacEachern
Reviewed by: Ben, Paul, Martin
Revision ChangesPath
1.74 +2 -8 apachen/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apachen/STATUS,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- STATUS1998/01/11 18:30:08 1.73
+++ STATUS1998/01/11 20:24:57 1.74
@@ -74,6 +74,8 @@
* Dean's [PATCH] make mod_include use ap_cpystrn
* WIN32: fix proxy caching
* WIN32: fix CGI scripts called w/o '=' in path info PR#1591
+* Doug's [PATCH] add -c and -C switches (take 3)
+* Paul's WIN32: patch to allow for Doug's -c option
Available Patches:
@@ -100,14 +102,6 @@
* Dean's [PATCH] yet another slow function
<[EMAIL PROTECTED]>
Status: Dean +1, Jim +1, Martin +1, Paul +1
-
-* 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, Ben +1, Paul +1
* Brian Havard's [Patch] OS/2 - fix up shut down
<[EMAIL PROTECTED]>
1.562 +8 -0 apachen/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.561
retrieving revision 1.562
diff -u -r1.561 -r1.562
--- CHANGES 1998/01/10 05:46:32 1.561
+++ CHANGES 1998/01/11 20:24:58 1.562
@@ -1,5 +1,13 @@
Changes with Apache 1.3b4
+ *) new -C and -c command line arguments
+ usage:
+ -C "directive" : process directive before reading config files
+ -c "directive" : process directive after reading config files
+ example:
+ httpd -C "PerlModule Apache::httpd_conf"
+ [Doug MacEachern]
+
*) WIN32: Fix the execution of CGIs that are scripts and called
with path info that does not have an '=' in.
(eg. http://server/cgi-bin/printenv?foobar) PR#1591
1.22 +4 -0 apachen/src/main/http_conf_globals.h
Index: http_conf_globals.h
===
RCS file: /export/home/cvs/apachen/src/main/http_conf_globals.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- http_conf_globals.h 1998/01/07 16:46:02 1.21
+++ http_conf_globals.h 1998/01/11 20:25:01 1.22
@@ -88,6 +88,10 @@
extern char server_root[MAX_STRING_LEN];
extern char server_confname[MAX_STRING_LEN];
+/* for -C and -c switches */
+extern array_header *server_pre_read_config;
+extern array_header *server_post_read_config;
+
/* We want this to have the least chance of being corrupted if there
* is some memory corruption, so we allocate it statically.
*/
1.92 +47 -0 apachen/src/main/http_config.c
Index: http_config.c
===
RCS file: /export/home/cvs/apachen/src/main/http_config.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- http_config.c 1998/01/07 16:46:03 1.91
+++ http_config.c 1998/01/11 20:25:03 1.92
@@ -900,6 +900,42 @@
return make_full_path(p, server_root, file);
}
+void process_command_config(server_rec *s, array_header *arr, pool *p, pool
*ptemp)
+{
+const char *errmsg;
+cmd_parms parms;
+int i;
+char **lines = (char **)arr->elts;
+
+parms = default_parms;
+parms.pool = p;
+parms.temp_pool = ptemp;
+parms.server = s;
+parms.override = (RSRC_CONF | OR_ALL) & ~(OR_AUTHCFG | OR_LIMIT);
+parms.config_file = pcfg_openfile(p, NULL);
+
+for (i = 0; i < arr->nelts; ++i) {
+ char *line = lines[i];
+
+#ifdef MOD_PERL
+ if(!(strncmp(line, "PerlModule ", 11))) {
+ const char *perl_cmd_module(cmd_parms *parms, void *dummy, char
*arg);
+ line += 11;
+ (void)perl_cmd_module(&parms, s->lookup_defaults, line);
+ continue;
+ }
+#endif
+
+ errmsg = handle_command(&parms, s->lookup_defaults, line);
+
+ if (errmsg) {
+ fprintf(stderr, "Syntax error in command: `%s'\n", lines[i]);
+ fprintf(stderr, "%s\n", errmsg);
+ exit(1);
+ }
+}
+}
+
v
cvs commit: apachen STATUS
martin 98/01/11 10:30:09 Modified:.STATUS Log: Add Spelling patch, redraw Location patch (noted by Dean) Revision ChangesPath 1.73 +5 -4 apachen/STATUS Index: STATUS === RCS file: /home/cvs/apachen/STATUS,v retrieving revision 1.72 retrieving revision 1.73 diff -u -u -r1.72 -r1.73 --- STATUS1998/01/11 17:00:06 1.72 +++ STATUS1998/01/11 18:30:08 1.73 @@ -109,13 +109,14 @@ of this over -M Status: Doug +1, Martin +1, Ben +1, Paul +1 -* Martin's [PATCH] within .htaccess? - <[EMAIL PROTECTED]> - Status: Martin +1, Jim +1 - * Brian Havard's [Patch] OS/2 - fix up shut down <[EMAIL PROTECTED]> Status: Dean +1 + +* Martin's [PATCH] mod_speling [300] Multiple Choices bug (Take 2) + Submitted by: Soeren Ziehe <[EMAIL PROTECTED]> + <[EMAIL PROTECTED]> + Status: Martin +1, * Martin's [PATCH] 36kB: Make apache compile & run on an EBCDIC mainframe <[EMAIL PROTECTED]>
cvs commit: apachen STATUS
pcs 98/01/11 09:00:07 Modified:.STATUS Log: I like the -c and -C options. They have been tested and work. They also work on NT, with a corresponding patch to NT's apache_main() (and after moving NT's current -c to -Z). Revision ChangesPath 1.72 +2 -2 apachen/STATUS Index: STATUS === RCS file: /export/home/cvs/apachen/STATUS,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- STATUS1998/01/11 16:15:38 1.71 +++ STATUS1998/01/11 17:00:06 1.72 @@ -99,7 +99,7 @@ * Dean's [PATCH] yet another slow function <[EMAIL PROTECTED]> - Status: Dean +1, Jim +1, Martin +1 + Status: Dean +1, Jim +1, Martin +1, Paul +1 * Doug's [PATCH] add -c and -C switches (take 3) <[EMAIL PROTECTED]> @@ -107,7 +107,7 @@ 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, Ben +1 + Status: Doug +1, Martin +1, Ben +1, Paul +1 * Martin's [PATCH] within .htaccess? <[EMAIL PROTECTED]>
cvs commit: apachen/src/main http_main.c
pcs 98/01/11 08:51:33 Modified:src/main http_main.c Log: Win32 MT debug stuff: defining DEBUG_TO_ERROR_LOG should send the output of the debugging APDx() macros to the error log. Revision ChangesPath 1.264 +1 -1 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.263 retrieving revision 1.264 diff -u -r1.263 -r1.264 --- http_main.c 1998/01/07 16:46:06 1.263 +++ http_main.c 1998/01/11 16:51:32 1.264 @@ -116,7 +116,7 @@ */ # ifdef _DEBUG -# ifndef DEBUG_TO_ERROR_LOG +# ifdef DEBUG_TO_ERROR_LOG # define APD1(a) aplog_error(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,server_conf,a) # define APD2(a,b) aplog_error(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,server_conf,a,b) # define APD3(a,b,c) aplog_error(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,server_conf,a,b,c)
cvs commit: apachen STATUS
coar98/01/11 08:15:39 Modified:.STATUS Log: These aren't directly related to the software, but are definitely related to the process by which it's developed. Calling for votes on commit-then-review and a patches-for-voting directory. Revision ChangesPath 1.71 +13 -0 apachen/STATUS Index: STATUS === RCS file: /export/home/cvs/apachen/STATUS,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- STATUS1998/01/11 15:58:35 1.70 +++ STATUS1998/01/11 16:15:38 1.71 @@ -188,6 +188,19 @@ Open issues: +* Ken's [POLL] apachen/patches directory + Shall we experiment with allowing patches to be distributed for + voting through cvs, by creating a directory under the source tree + and putting them there? Please vote. + <[EMAIL PROTECTED]> + Status: Ken +1 + +* Ken's [POLL] experiment with commit-then-review + Shall we permit unreviewed commits to the source tree? (Details + of when it's [in]appropriate to be worked out later.) Vote, please. + <[EMAIL PROTECTED]> + Status: Ken +1 + * Paul would like to see a 'gdbm' option because he uses it a lot. Dean notes that 'gdbm' include 'db' support so we need to watch the library ordering.
cvs commit: apachen STATUS
coar98/01/11 07:58:36 Modified:.STATUS Log: Add info about a couple of patches Dean submitted but which haven't been listed here yet. Revision ChangesPath 1.70 +10 -1 apachen/STATUS Index: STATUS === RCS file: /export/home/cvs/apachen/STATUS,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- STATUS1998/01/11 06:31:14 1.69 +++ STATUS1998/01/11 15:58:35 1.70 @@ -77,8 +77,17 @@ Available Patches: +* Dean's [PATCH] unneeded pstrdup()s (in table_*() calls) + <[EMAIL PROTECTED]> + Status: Dean +1 + +* Dean's [PATCH] MONCONTROL for profiling children + <[EMAIL PROTECTED]> + Status: Dean +1 + * Marc's [PATCH] don't log bogus errno when file doesn't exist -<[EMAIL PROTECTED]> + <[EMAIL PROTECTED]> + Status: * Dean's [PATCH] OSF/1 serialized accept <[EMAIL PROTECTED]>
cvs commit: apachen/src/main .cvsignore
dgaudet 98/01/10 23:06:19 Modified:src/main .cvsignore Log: Since we don't symlink os.h and os-inline.h any longer we shouldn't .cvsignore them... I just ran into a bug in one of my old trees that I just "cvs update"d 'cause of an old copy of os.h. d'ohh. Revision ChangesPath 1.3 +0 -2 apachen/src/main/.cvsignore Index: .cvsignore === RCS file: /export/home/cvs/apachen/src/main/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore1997/09/12 20:14:19 1.2 +++ .cvsignore1998/01/11 07:06:18 1.3 @@ -1,3 +1 @@ Makefile -os.h -os-inline.c
cvs commit: apachen STATUS
marc98/01/10 22:31:14 Modified:.STATUS Log: No idea what I gain. Revision ChangesPath 1.69 +3 -0 apachen/STATUS Index: STATUS === RCS file: /export/home/cvs/apachen/STATUS,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- STATUS1998/01/11 00:58:14 1.68 +++ STATUS1998/01/11 06:31:14 1.69 @@ -77,6 +77,9 @@ Available Patches: +* Marc's [PATCH] don't log bogus errno when file doesn't exist +<[EMAIL PROTECTED]> + * Dean's [PATCH] OSF/1 serialized accept <[EMAIL PROTECTED]> Status: Dean +1
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] within .htaccess? <[EMAIL PROTECTED]>
