Commit:    28608d199f3935a6b6c22281e1366fd5c0334774
Author:    Hannes Magnusson <[email protected]>         Wed, 11 Dec 2013 
15:39:13 -0800
Parents:   467e34ec685989b236008d0318c5a303de77e885
Branches:  master

Link:       
http://git.php.net/?p=web/people.git;a=commitdiff;h=28608d199f3935a6b6c22281e1366fd5c0334774

Log:
I guess the server isn't using apc anymore..

Changed paths:
  M  js/userlisting.php


Diff:
diff --git a/js/userlisting.php b/js/userlisting.php
index a710ff5..46d099c 100644
--- a/js/userlisting.php
+++ b/js/userlisting.php
@@ -8,7 +8,7 @@ function getAllUsers() {
     if (!$token) {
         $token = trim(file_get_contents("../token"));
     }
-    $retval = 
@file_get_contents("https://master.php.net/fetch/allusers.php?&token="; . 
rawurlencode($token), false, $ctx);
+    $retval = 
file_get_contents("https://master.php.net/fetch/allusers.php?&token="; . 
rawurlencode($token), false, $ctx);
     if (!$retval) {
         return;
     }
@@ -22,27 +22,26 @@ function getAllUsers() {
     return $json;
 }
 
-if(!$json = apc_fetch("cvsusers")) {
-    $json = getAllUsers();
-    if ($json) {
-        apc_store("cvsusers", $json, 3600);
-        apc_store("cvsusers_update", $_SERVER["REQUEST_TIME"], 3600);
+if (isset($_SERVER["HTTP_IF_MODIFIED_SINCE"])) {
+    $last = strtotime($_SERVER["HTTP_IF_MODIFIED_SINCE"]);
+
+    /* Cache the user list for a week */
+    if (strtotime("+1 week", $last) > $now) {
+        header("HTTP/1.1 304 Not Modified");
+        exit;
     }
 }
-$modified = apc_fetch("cvsusers_update");
+
+$json = getAllUsers();
 
 if (!$json) { return; }
 
-$tsstring = gmdate("D, d M Y H:i:s ", $modified);
-if (isset($_SERVER["HTTP_IF_MODIFIED_SINCE"]) && 
$_SERVER["HTTP_IF_MODIFIED_SINCE"] == $tsstring) {
-    header("HTTP/1.1 304 Not Modified");
-    exit;
-}
-else {
-    $expires = gmdate("D, d M Y H:i:s ", strtotime("+2 months", 
$_SERVER["REQUEST_TIME"])) . "GMT";
-    header("Last-Modified: " . $tsstring);
-    header("Expires: $expires");
-}
+$future = strtotime("+1 week", $now);
+$tsstring = gmdate("D, d M Y H:i:s ", $now) . "GMT";
+
+header("Last-Modified: " . $tsstring);
+header("Expires: " . date(DATE_RSS, $future));
+
 
 $lookup = $user = array();


--
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to