Changeset 1093
- Timestamp:
- 06/17/08 22:07:14 (3 months ago)
- Files:
-
- trunk/mango/net/servlet/ServletProvider.d (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/mango/net/servlet/ServletProvider.d
r1091 r1093 85 85 this (Logger log, uint urls = 2048) 86 86 { 87 assert (log); 88 87 89 // small, low contention hashmap for contexts 88 90 contexts = new HashMap (128, 0.75, 1); … … 205 207 { 206 208 // context is always used, even when it's "" for the default context 207 char[] context = "^" ~ servlet.getContext.getName ();209 char[] context = "^" ~ servlet.getContext.getName; 208 210 209 211 // check for default context specifier … … 231 233 232 234 // add to list of mappings 233 mappings ~= new ServletMapping (servlet, new Regex(pattern, null)); 234 235 version (Debug) 236 printf ("Pattern '%.*s'\n", pattern); 235 auto mapping = new ServletMapping (servlet, new Regex(pattern, null)); 236 log.info ("mapping servlet {} to path '{}'", servlet.name, pattern); 237 mappings ~= mapping; 237 238 } 238 239 … … 278 279 body 279 280 { 280 auto proxy = new ServletProxy (servlet, null, config.getServletContext);281 auto proxy = new ServletProxy (servlet, servlet.toString, config.getServletContext); 281 282 282 283 // initialize this servlet … … 333 334 // retrieve the requested uri 334 335 path = request.uri.getPath(); 335 336 log.info ("request path '{}'", path); 337 336 338 // lookup servlet for this path 337 339 pm = cast (PathMapping) cache.get (path); … … 518 520 private class ServletMapping 519 521 { 520 private Regex regex;522 private Regex regex; 521 523 private IRegisteredServlet proxy; 522 524 … … 528 530 529 531 this (IRegisteredServlet proxy, Regex regex) 530 { 532 { 531 533 this.regex = regex; 532 534 this.proxy = proxy;
