cvs commit: apachen/src/modules/standard mod_include.c
dgaudet 98/01/07 19:16:50
Modified:src/modules/standard mod_include.c
Log:
switch from safe_copy to ap_cpystrn
Revision ChangesPath
1.62 +10 -16apachen/src/modules/standard/mod_include.c
Index: mod_include.c
===
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_include.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- mod_include.c 1998/01/07 22:24:11 1.61
+++ mod_include.c 1998/01/08 03:16:48 1.62
@@ -97,12 +97,6 @@
#define SIZEFMT_KMG 1
-static ap_inline void safe_copy(char *dest, const char *src, size_t max_len)
-{
-strncpy(dest, src, max_len - 1);
-dest[max_len - 1] = '\0';
-}
-
/* Environment function --
*/
static void add_include_vars(request_rec *r, char *timefmt)
@@ -366,7 +360,7 @@
GET_CHAR(in, c, NULL, p);
} while (isspace(c));
if (c == '') {
-safe_copy(tag, done, tagbuf_len);
+ap_cpystrn(tag, done, tagbuf_len);
return tag;
}
}
@@ -1574,7 +1568,7 @@
rputs( Evaluate string\n, r);
#endif
parse_string(r, current-token.value, buffer, sizeof(buffer), 0);
- safe_copy(current-token.value, buffer,
sizeof(current-token.value));
+ ap_cpystrn(current-token.value, buffer,
sizeof(current-token.value));
current-value = (current-token.value[0] != '\0');
current-done = 1;
current = current-parent;
@@ -1598,7 +1592,7 @@
case token_string:
parse_string(r, current-left-token.value,
buffer, sizeof(buffer), 0);
-safe_copy(current-left-token.value, buffer,
+ap_cpystrn(current-left-token.value, buffer,
sizeof(current-left-token.value));
current-left-value = (current-left-token.value[0] !=
'\0');
current-left-done = 1;
@@ -1613,7 +1607,7 @@
case token_string:
parse_string(r, current-right-token.value,
buffer, sizeof(buffer), 0);
-safe_copy(current-right-token.value, buffer,
+ap_cpystrn(current-right-token.value, buffer,
sizeof(current-right-token.value));
current-right-value = (current-right-token.value[0] !=
'\0');
current-right-done = 1;
@@ -1660,11 +1654,11 @@
}
parse_string(r, current-left-token.value,
buffer, sizeof(buffer), 0);
-safe_copy(current-left-token.value, buffer,
+ap_cpystrn(current-left-token.value, buffer,
sizeof(current-left-token.value));
parse_string(r, current-right-token.value,
buffer, sizeof(buffer), 0);
-safe_copy(current-right-token.value, buffer,
+ap_cpystrn(current-right-token.value, buffer,
sizeof(current-right-token.value));
if (current-right-token.value[0] == '/') {
int len;
@@ -1725,11 +1719,11 @@
}
parse_string(r, current-left-token.value,
buffer, sizeof(buffer), 0);
-safe_copy(current-left-token.value, buffer,
+ap_cpystrn(current-left-token.value, buffer,
sizeof(current-left-token.value));
parse_string(r, current-right-token.value,
buffer, sizeof(buffer), 0);
-safe_copy(current-right-token.value, buffer,
+ap_cpystrn(current-right-token.value, buffer,
sizeof(current-right-token.value));
#ifdef DEBUG_INCLUDE
rvputs(r, Compare (, current-left-token.value,
@@ -2056,8 +2050,8 @@
int printing;
int conditional_status;
-safe_copy(error, DEFAULT_ERROR_MSG, sizeof(error));
-safe_copy(timefmt, DEFAULT_TIME_FORMAT, sizeof(timefmt));
+ap_cpystrn(error, DEFAULT_ERROR_MSG, sizeof(error));
+ap_cpystrn(timefmt, DEFAULT_TIME_FORMAT, sizeof(timefmt));
sizefmt = SIZEFMT_KMG;
/* Turn printing on */
cvs commit: apachen STATUS
dgaudet 98/01/07 19:18:22 Modified:.STATUS Log: make mod_include use ap_cpystrn Reviewed by: Brian Behlendorf, Jim Jagielski Revision ChangesPath 1.61 +1 -4 apachen/STATUS Index: STATUS === RCS file: /export/home/cvs/apachen/STATUS,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- STATUS1998/01/08 02:37:23 1.60 +++ STATUS1998/01/08 03:18:22 1.61 @@ -71,16 +71,13 @@ * Paul's [PATCH] a bundle of multithreading changes * Ken's [PATCH] for copyright year update * Dean's [PATCH] 1.3: security updates for mod_imap and mod_include +* Dean's [PATCH] make mod_include use ap_cpystrn Available Patches: * Dean's [PATCH] make mod_rewrite use ap_cpystrn [EMAIL PROTECTED] Status: waiting to find out status of Ralf's mod_rewrite restructuring - -* Dean's [PATCH] make mod_include use ap_cpystrn - [EMAIL PROTECTED] - Status: Dean +1, Brian +1 * Dean's [PATCH] yet another slow function [EMAIL PROTECTED]
cvs commit: apachen/src/main http_request.c
marc98/01/07 19:56:09 Modified:src/main http_request.c Log: Move os_canonical_filename call to after the section where !os_is_path_absolute names are dealt with to prevent bogus munging of things like proxy: May(?) still cause problems with regex stuff, but fixes proxy caching on win32. Reviewed by: Ben Laurie Revision ChangesPath 1.98 +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.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- http_request.c1998/01/07 16:46:12 1.97 +++ http_request.c1998/01/08 03:56:08 1.98 @@ -286,7 +286,6 @@ return OK; } -r-filename = os_canonical_filename(r-pool, r-filename); test_filename = pstrdup(r-pool, r-filename); /* @@ -337,6 +336,7 @@ return OK; } +r-filename = os_canonical_filename(r-pool, r-filename); no2slash(test_filename); num_dirs = count_dirs(test_filename);
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 CHANGES
marc98/01/07 21:58:24 Modified:.STATUS src CHANGES Log: Update status and changes. Revision ChangesPath 1.63 +3 -0 apachen/STATUS Index: STATUS === RCS file: /export/home/cvs/apachen/STATUS,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- STATUS1998/01/08 05:14:50 1.62 +++ STATUS1998/01/08 05:58:20 1.63 @@ -72,6 +72,7 @@ * Ken's [PATCH] for copyright year update * Dean's [PATCH] 1.3: security updates for mod_imap and mod_include * Dean's [PATCH] make mod_include use ap_cpystrn +* fix proxy caching on win32 Available Patches: @@ -231,3 +232,5 @@ * Ken's PR#1053: an error when accessing a negotiated document explicitly names the variant selected. Should it do so, or should the base input name be referenced? + +* bad use of chdir in some places; it isn't thread-specific 1.560 +4 -0 apachen/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apachen/src/CHANGES,v retrieving revision 1.559 retrieving revision 1.560 diff -u -r1.559 -r1.560 --- CHANGES 1998/01/07 22:24:37 1.559 +++ CHANGES 1998/01/08 05:58:21 1.560 @@ -1,5 +1,9 @@ Changes with Apache 1.3b4 + *) WIN32: Fix a call to os_canonical_filename so it doesn't try to + mess with fake filenames. This fixes proxy caching on + win32. PR#1265 + *) SECURITY: General mod_include cleanup, including fixing several possible buffer overflows and a possible infinite loop. [Dean Gaudet, Marc Slemko]
cvs commit: apache STATUS
dgaudet 98/01/08 13:20:07 Modified:.Tag: APACHE_1_2_X STATUS Log: some updates Revision ChangesPath No revision No revision 1.1.2.3 +8 -0 apache/Attic/STATUS Index: STATUS === RCS file: /export/home/cvs/apache/Attic/STATUS,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- STATUS1998/01/07 22:35:26 1.1.2.2 +++ STATUS1998/01/08 21:20:05 1.1.2.3 @@ -35,6 +35,14 @@ [EMAIL PROTECTED] Status: Mark +1, Dean +1 +* Martin's [PATCH]-1.2.6: passing escaped CC='$(CC)' (was: Re: STATUS: 1.2) + [EMAIL PROTECTED] + Status: Martin +1, Dean +1, Ken +1 + +* Martin's [PATCH]-1.2.6: avoid B_ERROR redeclaration (was: Re: STATUS: 1.2) + [EMAIL PROTECTED] + Status: Martin +1, Jim +1, Dean +1 + Needs patch: * Some fix for the bogus byte ranges bug.
