fixed small WebSocket handshake bug

mojolicious · Nov 27, 2011 · 45eae00 · 45eae00
1 parent 92b535a
commit 45eae00
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/Changes b/Changes
@@ -1,9 +1,10 @@
 This file documents the revision history for Perl extension Mojolicious.
 
-2.33    2011-11-26 00:00:00
+2.33    2011-11-27 00:00:00
         - Improved Mojo::EventEmitter performance slightly.
         - Improved documentation.
         - Fixed a few small inline template issues.
+        - Fixed small WebSocket handshake bug.
 
 2.32    2011-11-24 00:00:00
         - Added EXPERIMENTAL error event to Mojo::IOWatcher.

diff --git a/lib/Mojo/Headers.pm b/lib/Mojo/Headers.pm
@@ -682,7 +682,7 @@ Shortcut for the C<Transfer-Encoding> header.
 =head2 C<upgrade>
 
   my $upgrade = $headers->upgrade;
-  $headers    = $headers->upgrade('WebSocket');
+  $headers    = $headers->upgrade('websocket');
 
 Shortcut for the C<Upgrade> header.
 

diff --git a/lib/Mojo/Message/Request.pm b/lib/Mojo/Message/Request.pm
@@ -219,8 +219,8 @@ sub _build_start_line {
     my $clone = $url = $url->clone;
     $clone->userinfo(undef);
     $path = $clone
-      unless ($self->headers->upgrade || '') eq 'websocket'
-      || ($url->scheme || '') eq 'https';
+      unless lc($self->headers->upgrade || '') eq 'websocket'
+        || ($url->scheme || '') eq 'https';
   }
 
   # HTTP 0.9

diff --git a/lib/Mojo/Transaction/HTTP.pm b/lib/Mojo/Transaction/HTTP.pm
@@ -130,7 +130,7 @@ sub server_read {
   elsif ((length $chunk == 0) || ($req->is_finished && !$self->{handled}++)) {
     $self->emit(
       upgrade => Mojo::Transaction::WebSocket->new(handshake => $self))
-      if (($req->headers->upgrade || '') eq 'websocket');
+      if lc($req->headers->upgrade || '') eq 'websocket';
     $self->emit('request');
   }
 

diff --git a/lib/Mojo/UserAgent/Transactor.pm b/lib/Mojo/UserAgent/Transactor.pm
@@ -171,8 +171,8 @@ sub proxy_connect {
   # WebSocket and/or HTTPS
   my $url = $req->url;
   return
-    unless ($req->headers->upgrade || '') eq 'websocket'
-    || ($url->scheme || '') eq 'https';
+    unless lc($req->headers->upgrade || '') eq 'websocket'
+      || ($url->scheme || '') eq 'https';
 
   # CONNECT request
   my $new = $self->tx(CONNECT => $url->clone);