You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2006/03/13 17:11:20 UTC
svn commit: r385580 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
modules/mappers/mod_speling.c
Author: trawick
Date: Mon Mar 13 08:11:18 2006
New Revision: 385580
URL: http://svn.apache.org/viewcvs?rev=385580&view=rev
Log:
merge fix to mod_speling crash when r->filename is not set
Reviewed by: jerenkrantz, jim
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/modules/mappers/mod_speling.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/CHANGES?rev=385580&r1=385579&r2=385580&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Mon Mar 13 08:11:18 2006
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache 2.2.1
+ *) mod_speling: Stop crashing with certain non-file requests. [Jeff Trawick]
+
*) SECURITY: CVE-2005-3357 (cve.mitre.org)
mod_ssl: Fix a possible crash during access control checks if a
non-SSL request is processed for an SSL vhost (such as the
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/STATUS?rev=385580&r1=385579&r2=385580&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Mon Mar 13 08:11:18 2006
@@ -156,11 +156,6 @@
URL: http://people.apache.org/~wrowe/fixldap_mask.patch
+1: wrowe
- * mod_speling: Don't crash if r->filename unset.
- Trunk version of patch, which applies fine:
- http://svn.apache.org/viewcvs?rev=373519&view=rev
- +1: trawick, jerenkrantz, jim
-
* core: Fix up botched status lines (mismatch with r->status or
just badly formatted)
Trunk version of patch, which applies fine:
Modified: httpd/httpd/branches/2.2.x/modules/mappers/mod_speling.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/mappers/mod_speling.c?rev=385580&r1=385579&r2=385580&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/mappers/mod_speling.c (original)
+++ httpd/httpd/branches/2.2.x/modules/mappers/mod_speling.c Mon Mar 13 08:11:18 2006
@@ -213,7 +213,12 @@
}
/* We've already got a file of some kind or another */
- if (r->proxyreq || (r->finfo.filetype != 0)) {
+ if (r->finfo.filetype != 0) {
+ return DECLINED;
+ }
+
+ /* Not a file request */
+ if (r->proxyreq || !r->filename) {
return DECLINED;
}