Browse Source

update: support cf etag

tokumeikoi 3 years ago
parent
commit
1111c6f13d

+ 2 - 2
app/Http/Controllers/Server/DeepbworkController.php

@@ -56,13 +56,13 @@ class DeepbworkController extends Controller
             array_push($result, $user);
         }
         $eTag = sha1(json_encode($result));
-        if ($eTag === $request->header("IF-NONE-MATCH")) {
+        if (strpos($request->header('If-None-Match'), $eTag) !== false ) {
             abort(304);
         }
         return response([
             'msg' => 'ok',
             'data' => $result,
-        ])->header('ETag', $eTag);
+        ])->header('ETag', "\"{$eTag}\"");
     }
 
     // 后端提交数据

+ 2 - 2
app/Http/Controllers/Server/ShadowsocksTidalabController.php

@@ -49,12 +49,12 @@ class ShadowsocksTidalabController extends Controller
             ]);
         }
         $eTag = sha1(json_encode($result));
-        if ($eTag === $request->header("IF-NONE-MATCH")) {
+        if (strpos($request->header('If-None-Match'), $eTag) !== false ) {
             abort(304);
         }
         return response([
             'data' => $result
-        ])->header('ETag', $eTag);
+        ])->header('ETag', "\"{$eTag}\"");
     }
 
     // 后端提交数据

+ 2 - 2
app/Http/Controllers/Server/TrojanTidalabController.php

@@ -53,13 +53,13 @@ class TrojanTidalabController extends Controller
             array_push($result, $user);
         }
         $eTag = sha1(json_encode($result));
-        if ($eTag === $request->header("IF-NONE-MATCH")) {
+        if (strpos($request->header('If-None-Match'), $eTag) !== false ) {
             abort(304);
         }
         return response([
             'msg' => 'ok',
             'data' => $result,
-        ])->header('ETag', $eTag);
+        ])->header('ETag', "\"{$eTag}\"");
     }
 
     // 后端提交数据