Merge tag '2.2.1'

brianlmoon · brianlmoon · commit 9fdd327aebe8 · 2023-02-24T14:26:29.000-06:00
diff --git a/Net/Gearman/Connection.php b/Net/Gearman/Connection.php
@@ -261,17 +261,17 @@ public function send($command, array $params = array())
             throw new Net_Gearman_Exception('Invalid command: ' . $command);
         }
 
+        if ($command === 'can_do_timeout') {
+            $params = $this->fixTimeout($params);
+        }
+
         $data = array();
         foreach ($this->commands[$command][1] as $field) {
             if (isset($params[$field])) {
                 $data[] = $params[$field];
             }
         }
 
-        if ($command === 'can_do_timeout') {
-            $params = $this->fixTimeout($params);
-        }
-
         $d = implode("\x00", $data);
 
         $cmd = "\0REQ" . pack("NN",

Original file line number	Diff line number	Diff line change
`@@ -261,17 +261,17 @@ public function send($command, array $params = array())`
`261`	`261`	`throw new Net_Gearman_Exception('Invalid command: ' . $command);`
`262`	`262`	`}`
`263`	`263`
	`264`	`+ if ($command === 'can_do_timeout') {`
	`265`	`+ $params = $this->fixTimeout($params);`
	`266`	`+ }`
	`267`	`+`
`264`	`268`	`$data = array();`
`265`	`269`	`foreach ($this->commands[$command][1] as $field) {`
`266`	`270`	`if (isset($params[$field])) {`
`267`	`271`	`$data[] = $params[$field];`
`268`	`272`	`}`
`269`	`273`	`}`
`270`	`274`
`271`		`- if ($command === 'can_do_timeout') {`
`272`		`- $params = $this->fixTimeout($params);`
`273`		`- }`
`274`		`-`
`275`	`275`	`$d = implode("\x00", $data);`
`276`	`276`
`277`	`277`	`$cmd = "\0REQ" . pack("NN",`