Changeset 1047
- Timestamp:
- 11/23/07 16:18:49 (1 year ago)
- Files:
-
- trunk/mango/icu/UString.d (modified) (1 diff)
- trunk/mango/net/http/server/HttpProvider.d (modified) (1 diff)
- trunk/mango/net/http/server/HttpResponse.d (modified) (1 diff)
- trunk/mango/net/http/server/HttpServer.d (modified) (1 diff)
- trunk/mango/net/http/server/ServiceProvider.d (modified) (1 diff)
- trunk/mango/net/servlet/Servlet.d (modified) (3 diffs)
- trunk/mango/net/servlet/ServletContext.d (modified) (1 diff)
- trunk/mango/net/servlet/ServletProvider.d (modified) (3 diffs)
- trunk/mango/net/servlet/tools/AdminServlet.d (modified) (1 diff)
- trunk/mango/net/util/AbstractServer.d (modified) (1 diff)
- trunk/mango/net/util/KeepAliveServer.d (modified) (2 diffs)
- trunk/mango/net/util/ServerThread.d (modified) (1 diff)
- trunk/mango/net/util/cache/Payload.d (modified) (1 diff)
- trunk/mango/net/util/cache/QueuedCache.d (modified) (1 diff)
- trunk/mango/xml/rpc/Servlet.d (modified) (1 diff)
- trunk/mango/xml/sax/parser/teqXML.d (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/mango/icu/UString.d
r939 r1047 1193 1193 ***********************************************************************/ 1194 1194 1195 final char[] to Utf8(char[] dst = null)1195 final char[] toString (char[] dst = null) 1196 1196 { 1197 1197 uint x; trunk/mango/net/http/server/HttpProvider.d
r1014 r1047 68 68 **********************************************************************/ 69 69 70 override char[] to Utf8()70 override char[] toString() 71 71 { 72 72 return "raw"; trunk/mango/net/http/server/HttpResponse.d
r966 r1047 144 144 void sendError (inout HttpStatus status, Exception ex) 145 145 { 146 sendError (status, status.name, ex.to Utf8);146 sendError (status, status.name, ex.toString); 147 147 } 148 148 trunk/mango/net/http/server/HttpServer.d
r1014 r1047 91 91 **********************************************************************/ 92 92 93 override char[] to Utf8()93 override char[] toString() 94 94 { 95 return getProtocol~"::"~provider.to Utf8;95 return getProtocol~"::"~provider.toString; 96 96 } 97 97 trunk/mango/net/http/server/ServiceProvider.d
r939 r1047 55 55 **********************************************************************/ 56 56 57 char[] to Utf8();57 char[] toString (); 58 58 } 59 59 trunk/mango/net/servlet/Servlet.d
r957 r1047 13 13 module mango.net.servlet.Servlet; 14 14 15 private import tango.core.T ype : Time;15 private import tango.core.TimeSpan; 16 16 17 17 public import tango.net.http.HttpConst, … … 159 159 160 160 overridable implementation of getLastModified() returns 161 Time. maxto say it doesn't know.162 163 **********************************************************************/ 164 165 Time getLastModified (IServletRequest request)166 { 167 return Time .max;161 Time.zero to say it doesn't know. 162 163 **********************************************************************/ 164 165 TimeSpan getLastModified (IServletRequest request) 166 { 167 return TimeSpan.zero; 168 168 } 169 169 … … 182 182 { 183 183 auto lastModified = getLastModified (request); 184 if (lastModified is Time .max)184 if (lastModified is TimeSpan.zero) 185 185 doGet (request, response); 186 186 else trunk/mango/net/servlet/ServletContext.d
r947 r1047 360 360 IServletContext log (char[] msg, Object error) 361 361 { 362 logger.error (msg ~ error.to Utf8);362 logger.error (msg ~ error.toString); 363 363 return this; 364 364 } trunk/mango/net/servlet/ServletProvider.d
r939 r1047 124 124 **********************************************************************/ 125 125 126 override char[] to Utf8()126 override char[] toString() 127 127 { 128 128 return "Servlet"; … … 421 421 422 422 } catch (UnavailableException ux) 423 response.sendError (HttpResponses.ServiceUnavailable, ux.to Utf8);423 response.sendError (HttpResponses.ServiceUnavailable, ux.toString); 424 424 425 425 catch (ServletException sx) … … 438 438 private void error (ServletResponse response, Object x) 439 439 { 440 response.sendError (HttpResponses.InternalServerError, x.to Utf8);440 response.sendError (HttpResponses.InternalServerError, x.toString); 441 441 getDefaultContext.log ("Internal error:", x); 442 442 } trunk/mango/net/servlet/tools/AdminServlet.d
r960 r1047 111 111 action = "L"; 112 112 else 113 log.trace ("request to logadmin with uri: " ~ uri.to Utf8);113 log.trace ("request to logadmin with uri: " ~ uri.toString); 114 114 115 115 switch (action[0]) trunk/mango/net/util/AbstractServer.d
r987 r1047 79 79 **********************************************************************/ 80 80 81 protected abstract char[] to Utf8();81 protected abstract char[] toString(); 82 82 83 83 /********************************************************************** trunk/mango/net/util/KeepAliveServer.d
r1039 r1047 111 111 } catch (IOException x) 112 112 if (! Runtime.isHalting) 113 logger.trace (client ~ " '" ~ x.to Utf8() ~ "'");113 logger.trace (client ~ " '" ~ x.toString() ~ "'"); 114 114 115 115 catch (Object x) 116 logger.fatal (client ~ " '" ~ x.to Utf8() ~ "'");116 logger.fatal (client ~ " '" ~ x.toString() ~ "'"); 117 117 118 118 // log our halt status … … 196 196 **********************************************************************/ 197 197 198 override char[] to Utf8()198 override char[] toString() 199 199 { 200 200 return getProtocol ~ "::host"; trunk/mango/net/util/ServerThread.d
r969 r1047 91 91 92 92 } catch (IOException x) 93 server.getLogger.error ("IOException: "~x.to Utf8);93 server.getLogger.error ("IOException: "~x.toString); 94 94 95 95 catch (Object x) 96 server.getLogger.fatal ("Exception: "~x.to Utf8);96 server.getLogger.fatal ("Exception: "~x.toString); 97 97 } 98 98 } trunk/mango/net/util/cache/Payload.d
r1009 r1047 56 56 **********************************************************************/ 57 57 58 override char[] to Utf8()58 override char[] toString () 59 59 { 60 return super.to Utf8;60 return super.toString; 61 61 } 62 62 trunk/mango/net/util/cache/QueuedCache.d
r987 r1047 391 391 **********************************************************************/ 392 392 393 override char[] to Utf8()393 override char[] toString() 394 394 { 395 395 return key; trunk/mango/xml/rpc/Servlet.d
r955 r1047 346 346 void value(int i) { 347 347 if (current == null) 348 throw new Exception("Bad param: int = " ~ Integer.to Utf8(i));348 throw new Exception("Bad param: int = " ~ Integer.toString(i)); 349 349 current(ValueType.Int, i); 350 350 } trunk/mango/xml/sax/parser/teqXML.d
r1044 r1047 438 438 throw new TeqXMLException("Cannot have text (" ~ text ~ ") before first tag!"); 439 439 } else { 440 throw new TeqXMLException("Cannot have text (" ~ Utf.to Utf8(text) ~ ") before first tag!");440 throw new TeqXMLException("Cannot have text (" ~ Utf.toString(text) ~ ") before first tag!"); 441 441 } 442 442 } … … 620 620 else 621 621 { 622 //Stdout("Misnested tags: " ~ cast(char[])to Utf8(str, Into.type) ~ "'s hash does not match")(CR).flush();622 //Stdout("Misnested tags: " ~ cast(char[])toString(str, Into.type) ~ "'s hash does not match")(CR).flush(); 623 623 char[] str8; 624 624 static if (is(T == char)) { 625 625 str8 = str; 626 626 } else { 627 str8 = tango.text.convert.Utf.to Utf8(str);627 str8 = tango.text.convert.Utf.toString(str); 628 628 } 629 629 throw new TeqXMLException("Misnested tags: " ~ str8 ~ "'s hash does not match");
