Prechádzať zdrojové kódy

Renamed WebSocket variables to camelCase.

Ako Tulu 2 rokov pred
rodič
commit
9d587dae01
3 zmenil súbory, kde vykonal 14 pridanie a 13 odobranie
  1. 7 7
      src/Protocols/Websocket.php
  2. 6 6
      src/Protocols/Ws.php
  3. 1 0
      src/Worker.php

+ 7 - 7
src/Protocols/Websocket.php

@@ -72,11 +72,11 @@ class Websocket
                 return 0;
             }
         } else {
-            $firstbyte = ord($buffer[0]);
-            $secondbyte = ord($buffer[1]);
-            $dataLen = $secondbyte & 127;
-            $isFinFrame = $firstbyte >> 7;
-            $masked = $secondbyte >> 7;
+            $firstByte = ord($buffer[0]);
+            $secondByte = ord($buffer[1]);
+            $dataLen = $secondByte & 127;
+            $isFinFrame = $firstByte >> 7;
+            $masked = $secondByte >> 7;
 
             if (!$masked) {
                 Worker::safeEcho("frame not masked so close the connection\n");
@@ -84,7 +84,7 @@ class Websocket
                 return 0;
             }
 
-            $opcode = $firstbyte & 0xf;
+            $opcode = $firstByte & 0xf;
             switch ($opcode) {
                 case 0x0:
                     // Blob type.
@@ -392,7 +392,7 @@ class Websocket
                 }
             }
             if (!$hasServerHeader) {
-                $handshakeMessage .= "Server: workerman/" . Worker::VERSION . "\r\n";
+                $handshakeMessage .= 'Server: ' . Worker::$processTitle . ' ('. Worker::VERSION . ')' . "\r\n";
             }
             $handshakeMessage .= "\r\n";
             // Send handshake response.

+ 6 - 6
src/Protocols/Ws.php

@@ -73,11 +73,11 @@ class Ws
             }
         } else {
 
-            $firstbyte = ord($buffer[0]);
-            $secondbyte = ord($buffer[1]);
-            $dataLen = $secondbyte & 127;
-            $isFinFrame = $firstbyte >> 7;
-            $masked = $secondbyte >> 7;
+            $firstByte = ord($buffer[0]);
+            $secondByte = ord($buffer[1]);
+            $dataLen = $secondByte & 127;
+            $isFinFrame = $firstByte >> 7;
+            $masked = $secondByte >> 7;
 
             if ($masked) {
                 Worker::safeEcho("frame masked so close the connection\n");
@@ -85,7 +85,7 @@ class Ws
                 return 0;
             }
 
-            $opcode = $firstbyte & 0xf;
+            $opcode = $firstByte & 0xf;
 
             switch ($opcode) {
                 case 0x0:

+ 1 - 0
src/Worker.php

@@ -28,6 +28,7 @@ use Workerman\Events\Event;
 use Workerman\Events\EventInterface;
 use Workerman\Events\Revolt;
 use Workerman\Events\Select;
+use Workerman\Protocols\ProtocolInterface;
 
 /**
  * Worker class