Merge branch 'master' into http-server-rewrite

deanberris · deanberris · commit 02cf3ad9168d · 2013-05-22T21:00:26.000+10:00
diff --git a/http/src/network/protocol/http/message/wrappers/port.ipp b/http/src/network/protocol/http/message/wrappers/port.ipp
@@ -22,9 +22,9 @@ port_wrapper::operator boost:: uint16_t() const {
   if (!optional_port) {
     auto scheme_ = uri_.scheme();
     assert(scheme_);
-    if (*scheme_ == "http") {
+    if (scheme_->compare("http") == 0) {
       return 80u;
-    } else if (*scheme_ == "https") {
+    } else if (scheme_->compare("https") == 0) {
       return 443u;
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,9 @@ port_wrapper::operator boost:: uint16_t() const {`
`22`	`22`	`if (!optional_port) {`
`23`	`23`	`auto scheme_ = uri_.scheme();`
`24`	`24`	`assert(scheme_);`
`25`		`- if (*scheme_ == "http") {`
	`25`	`+ if (scheme_->compare("http") == 0) {`
`26`	`26`	`return 80u;`
`27`		`- } else if (*scheme_ == "https") {`
	`27`	`+ } else if (scheme_->compare("https") == 0) {`
`28`	`28`	`return 443u;`
`29`	`29`	`}`
`30`	`30`	`}`