[patch] Enforce Redirect argument types / Consistent args / Better error messages.

mod_alias.diff (text/plain), 2.42 KB, created by Sönke Tesch on 2008-04-01 10:31:36 UTC

(hide)

Description: Enforce Redirect argument types / Consistent args / Better error messages.

Filename:

MIME Type:

Creator: Sönke Tesch

Created: 2008-04-01 10:31:36 UTC

Size: 2.42 KB

patch

obsolete

>--- modules/mappers/mod_alias.c.2.2.8 2007-05-18 08:00:10.000000000 +0200 >+++ modules/mappers/mod_alias.c 2008-04-01 19:25:07.000000000 +0200 >@@ -180,16 +180,29 @@ > const char *f = arg2; > const char *url = arg3; > >- if (!strcasecmp(arg1, "gone")) >- status = HTTP_GONE; >- else if (!strcasecmp(arg1, "permanent")) >- status = HTTP_MOVED_PERMANENTLY; >- else if (!strcasecmp(arg1, "temp")) >- status = HTTP_MOVED_TEMPORARILY; >- else if (!strcasecmp(arg1, "seeother")) >- status = HTTP_SEE_OTHER; >- else if (apr_isdigit(*arg1)) >- status = atoi(arg1); >+ if (arg3 != NULL) { >+ if (!strcasecmp(arg1, "gone")) { >+ status = HTTP_GONE; >+ } >+ else if (!strcasecmp(arg1, "permanent") || !strcasecmp(arg1, "perm")) { >+ status = HTTP_MOVED_PERMANENTLY; >+ } >+ else if (!strcasecmp(arg1, "temp") || !strcasecmp(arg1, "temporary")) { >+ status = HTTP_MOVED_TEMPORARILY; >+ } >+ else if (!strcasecmp(arg1, "seeother")) { >+ status = HTTP_SEE_OTHER; >+ } >+ else if (apr_isdigit(*arg1)) { >+ status = atoi(arg1); >+ } >+ else { >+ return "mod_alias/Redirect: In case of three arguments, " >+ "first argument must be one of gone, perm(anent), " >+ "temp(orary), seeother, or a numeric HTTP status " >+ "code."; >+ } >+ } > else { > f = arg1; > url = arg2; >@@ -198,21 +211,21 @@ > if (use_regex) { > r = ap_pregcomp(cmd->pool, f, AP_REG_EXTENDED); > if (r == NULL) >- return "Regular expression could not be compiled."; >+ return "mod_alias/Redirect: Regular expression could not be compiled."; > } > > if (ap_is_HTTP_REDIRECT(status)) { > if (!url) >- return "URL to redirect to is missing"; >+ return "mod_alias/Redirect: URL to redirect to is missing"; > /* PR#35314: we can allow path components here; > * they get correctly resolved to full URLs. > */ > if (!use_regex && !ap_is_url(url) && (url[0] != '/')) >- return "Redirect to non-URL"; >+ return "mod_alias/Redirect: Redirect to non-URL"; > } > else { > if (url) >- return "Redirect URL not valid for this status"; >+ return "mod_alias/Redirect: Redirect URL not valid for this status"; > } > > if (cmd->path) View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]