Merge pull request #402 from qiniu/fix/redirect-header

fix header not correct if redirect

Author: bachue

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Next Version
 * 对象存储，修复无法对 key 为空字符串的对象进行操作
+* 修复 301 重定向无法正确获取 header 信息
 
 ## 7.8.0 (2022-10-25)
 * 移除不推荐域名，并增加区域亚太-首尔和华东-浙江2

src/Qiniu/Http/Header.php

@@ -35,8 +35,9 @@ public function __construct($obj = array())
      */
     public static function parseRawText($raw)
     {
+        $multipleHeaders = explode("\r\n\r\n", trim($raw));
         $headers = array();
-        $headerLines = explode("\r\n", $raw);
+        $headerLines = explode("\r\n", end($multipleHeaders));
         foreach ($headerLines as $line) {
             $headerLine = trim($line);
             $kv = explode(':', $headerLine);

tests/Qiniu/Tests/HttpTest.php

@@ -32,6 +32,15 @@ public function testGetTimeout()
         $this->assertEquals(-1, $response->statusCode);
     }
 
+    public function testGetRedirect()
+    {
+        $response = Client::get('localhost:9000/redirect.php');
+        $this->assertEquals(200, $response->statusCode);
+        $this->assertEquals('application/json;charset=UTF-8', $response->normalizedHeaders['Content-Type']);
+        $respData = $response->json();
+        $this->assertEquals('ok', $respData['msg']);
+    }
+
     public function testDelete()
     {
         $response = Client::delete('uc.qbox.me/bucketTagging', array());

tests/mock-server/ok.php

@@ -0,0 +1,3 @@
+<?php
+header("Content-Type: application/json;charset=UTF-8");
+echo '{"msg": "ok"}';

tests/mock-server/redirect.php

@@ -0,0 +1,5 @@
+<?php
+header("Content-Type: text/plain;charset=UTF-8", true);
+header("Location: ./ok.php", true, 301);
+echo "redirect to ok.php";
+exit();