>From 41d8ed42a2e0abf9e85a4672c5ef4cee33e0aded Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 6 Aug 2011 03:56:37 +0200 Subject: [PATCH] swazoo: Fix test failure due (4cdde5dc6eaf87cc24b2dea1da7732cfada7e6f7) 2011-08-05 Holger Freyther * HTTP.st: The SiteIdentifier>>#ip should return a String, the SiteIdentifierTest ended in a DNU on hostAddressString. Change HTTPRequest to keep the remote address as string instead. --- packages/swazoo-httpd/ChangeLog | 6 ++++++ packages/swazoo-httpd/HTTP.st | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/swazoo-httpd/ChangeLog b/packages/swazoo-httpd/ChangeLog index 93d58d4..8454654 100644 --- a/packages/swazoo-httpd/ChangeLog +++ b/packages/swazoo-httpd/ChangeLog @@ -1,5 +1,11 @@ 2011-08-05 Holger Freyther + * HTTP.st: The SiteIdentifier>>#ip should return a String, the + SiteIdentifierTest ended in a DNU on hostAddressString. Change + HTTPRequest to keep the remote address as string instead. + +2011-08-05 Holger Freyther + * Messages.st: Fix HTTPRequest>>#printOn:. by using nextPutAll: for Strings. diff --git a/packages/swazoo-httpd/HTTP.st b/packages/swazoo-httpd/HTTP.st index 1f9f7b8..4508dbc 100644 --- a/packages/swazoo-httpd/HTTP.st +++ b/packages/swazoo-httpd/HTTP.st @@ -192,7 +192,7 @@ Object subclass: HTTPConnection [ ifTrue: [aSwazooTask response: HTTPResponse badRequest]. [request peer: self stream socket remoteAddress] on: Error do: [:ex | ]. request - ip: self stream socket localAddress; + ip: self stream socket localAddress hostAddressString; setTimestamp. aSwazooTask request: request] on: SpError , HTTPException @@ -1760,7 +1760,7 @@ URIIdentifier subclass: SiteIdentifier [ ifTrue: [^true]. "is this always good?" myIP := SpIPAddress hostName: self ip port: self port. - otherIP := SpIPAddress hostName: aSiteIdentifier ip hostAddressString + otherIP := SpIPAddress hostName: aSiteIdentifier ip port: aSiteIdentifier port. ^myIP hostAddress = otherIP hostAddress ] -- 1.7.4.1