Browse files

Merge remote branch 'earthware/master' into RouteDefaultExtension

  • Loading branch information...
2 parents 3908e9f + a97b1f8 commit e75c699656ee022fba00e1199e75420db3e1bd22 @libardo libardo committed Sep 4, 2011
Showing with 2 additions and 1 deletion.
  1. +2 −1 src/Framework/N2/Web/Mvc/ContentRoute.cs
View
3 src/Framework/N2/Web/Mvc/ContentRoute.cs
@@ -123,7 +123,8 @@ private RouteData GetRouteDataForPath(HttpRequestBase request)
//the full url (with host) should be passed to UrlParser.ResolvePath():
string host = (request.Url.IsDefaultPort) ? request.Url.Host : request.Url.Authority;
string hostAndRawUrl = String.Format("{0}://{1}{2}", request.Url.Scheme, host, Url.ToAbsolute(request.AppRelativeCurrentExecutionFilePath));
- PathData td = engine.UrlParser.ResolvePath(hostAndRawUrl);
+ Url url = new Url(hostAndRawUrl).RemoveExtension(Url.DefaultExtension);
+ PathData td = engine.UrlParser.ResolvePath(url);
var page = td.CurrentPage;

0 comments on commit e75c699

Please sign in to comment.