fix warnings/errors (depending on compiler) introduced by the

trawick · trawick · commit dfde53196e33 · 2004-02-04T14:48:30.000Z
recent mod_expires backport Reviewed by: jorton, rederpj, trawick, Geoffrey Young git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@102497 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/STATUS b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/02/04 14:37:40 $]
+Last modified at [$Date: 2004/02/04 14:48:30 $]
 
 Release:
 
@@ -80,10 +80,6 @@ PATCHES TO BACKPORT FROM 2.1
   [ 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
diff --git a/modules/metadata/mod_expires.c b/modules/metadata/mod_expires.c
@@ -360,9 +360,9 @@ static const char *set_expiresbytype(cmd_parms *cmd, void *in_dir_config,
 {
     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;
     }

Original file line number	Diff line number	Diff line change
`@@ -360,9 +360,9 @@ static const char set_expiresbytype(cmd_parms cmd, void *in_dir_config,`
`360`	`360`	`{`
`361`	`361`	`expires_dir_config *dir_config = in_dir_config;`
`362`	`362`	`char response, real_code;`
`363`		`- char *check;`
	`363`	`+ const char *check;`
`364`	`364`
`365`		`- check = strrchr(mime, '/');`
	`365`	`+ check = ap_strrchr_c(mime, '/');`
`366`	`366`	`if ((strlen(++check) == 1) && (check == '')) {`
`367`	`367`	`dir_config->wildcards = 1;`
`368`	`368`	`}`