trawick 2004/02/04 06:48:30
Modified: . Tag: APACHE_2_0_BRANCH STATUS
modules/metadata Tag: APACHE_2_0_BRANCH mod_expires.c
Log:
fix warnings/errors (depending on compiler) introduced by the
recent mod_expires backport
Reviewed by: jorton, rederpj, trawick, Geoffrey Young
Revision Changes Path
No revision
No revision
1.751.2.673 +1 -5 httpd-2.0/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/httpd-2.0/STATUS,v
retrieving revision 1.751.2.672
retrieving revision 1.751.2.673
diff -u -r1.751.2.672 -r1.751.2.673
--- STATUS 4 Feb 2004 14:37:40 -0000 1.751.2.672
+++ STATUS 4 Feb 2004 14:48:30 -0000 1.751.2.673
@@ -80,10 +80,6 @@
[ please place file names and revisions from HEAD here, so it is easy to
identify exactly what the proposed changes are! ]
- * mod_expires: Fix new warnings introduced by ExpiresByType change.
- http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/metadata/mod_expires.c?r1=1.45&r2=1.46
- +1: jorton, rederpj
-
* fix DECLINE_CMD interaction with ITERATE/ITERATE2
http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/config.c?r1=1.168&r2=1.169
+1: geoff, trawick
No revision
No revision
1.39.2.9 +2 -2 httpd-2.0/modules/metadata/mod_expires.c
Index: mod_expires.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_expires.c,v
retrieving revision 1.39.2.8
retrieving revision 1.39.2.9
diff -u -r1.39.2.8 -r1.39.2.9
--- mod_expires.c 3 Feb 2004 21:51:38 -0000 1.39.2.8
+++ mod_expires.c 4 Feb 2004 14:48:30 -0000 1.39.2.9
@@ -360,9 +360,9 @@
{
expires_dir_config *dir_config = in_dir_config;
char *response, *real_code;
- char *check;
+ const char *check;
- check = strrchr(mime, '/');
+ check = ap_strrchr_c(mime, '/');
if ((strlen(++check) == 1) && (*check == '*')) {
dir_config->wildcards = 1;
}
|