Reversing array merge to avoid overwrites of default headers

mcocaro · mcocaro · commit 37feebff87f6 · 2015-06-18T11:29:01.000-07:00
diff --git a/Authentication/JWT.php b/Authentication/JWT.php
@@ -132,7 +132,7 @@ public static function encode($payload, $key, $alg = 'HS256', $keyId = null, $he
             $header['kid'] = $keyId;
         }
         if ( isset($head) && is_array($head) ) {
-            $header = array_merge($header, $head);
+            $header = array_merge($head, $header);
         }
         $segments = array();
         $segments[] = JWT::urlsafeB64Encode(JWT::jsonEncode($header));

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ public static function encode($payload, $key, $alg = 'HS256', $keyId = null, $he`
`132`	`132`	`$header['kid'] = $keyId;`
`133`	`133`	`}`
`134`	`134`	`if ( isset($head) && is_array($head) ) {`
`135`		`- $header = array_merge($header, $head);`
	`135`	`+ $header = array_merge($head, $header);`
`136`	`136`	`}`
`137`	`137`	`$segments = array();`
`138`	`138`	`$segments[] = JWT::urlsafeB64Encode(JWT::jsonEncode($header));`