<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[3765] sites/trunk/wordcamp.org/public_html/wp-content/wp-super-cache-plugins/rest-api.php: WPSC Plugins: Update Tagregator to reflect changes in new REST API plugin</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/3765">3765</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/3765","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-08-02 22:00:35 +0000 (Tue, 02 Aug 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>WPSC Plugins: Update Tagregator to reflect changes in new REST API plugin</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentwpsupercachepluginsrestapiphp">sites/trunk/wordcamp.org/public_html/wp-content/wp-super-cache-plugins/rest-api.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentwpsupercachepluginsrestapiphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/wp-super-cache-plugins/rest-api.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/wp-super-cache-plugins/rest-api.php 2016-08-02 19:37:38 UTC (rev 3764)
+++ sites/trunk/wordcamp.org/public_html/wp-content/wp-super-cache-plugins/rest-api.php 2016-08-02 22:00:35 UTC (rev 3765)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,41 +1,32 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-namespace WordCamp\WPSC_Plugins\REST_API;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+namespace WordCamp\WPSC_Plugins\Tagregator;
</ins><span class="cx" style="display: block; padding: 0 10px"> defined( 'WPCACHEHOME' ) or die();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_cacheaction( 'cache_init', __NAMESPACE__ . '\prune_tagregator_requests' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/*
+ * This plugin depends on the new WPSC REST-API plugin, so it's disabled until that plugin is merged
+ *
+ * See https://github.com/Automattic/wp-super-cache/pull/121/
+ */
+return;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_cacheaction( 'serve_cache_file_init', __NAMESPACE__ . '\prune_tagregator_requests' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Prune cached files for Tagregator requests after 30 seconds.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Normally WPSC caches files for `$cache_max_time` (which is currently set to 30 minutes), but Tagregator needs
</span><span class="cx" style="display: block; padding: 0 10px"> * updates in near-real time. We still need to cache them, though, because the server once got overloaded when
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * they were all uncached.
- *
- * @todo After upgrading to v2 of REST API, it would be faster to use strpos() instead of preg_match(). That might
- * be worth it since this runs on every request, including cached ones.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * they were completely uncached.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function prune_tagregator_requests() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $blog_cache_dir, $wp_cache_request_uri, $wp_cache_gzip_encoding;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wp_cache_request_uri, $blog_cache_dir, $cache_filename, $wp_cache_rest_prefix;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tagregator_request_pattern = '#^(\/wp-json).*(\/posts).*(type\[\]=tggr-)#'; // matches v1 and v2 of the REST API
-
- if ( 1 !== preg_match( $tagregator_request_pattern, urldecode( $_SERVER['REQUEST_URI'] ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false === strpos( $wp_cache_request_uri, "/$wp_cache_rest_prefix/tagregator/" ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- /*
- * The `cache_init` action is too early for this, but the others are too late, so we have to mimic some WPSC
- * code from `wp-cache-phase1.php` here, in order to accurately derive `$cache_file`.
- *
- * The request URI was decoded above to make the matching regex more intuitive, but it's left encoded here
- * because `$cache_file` is partially derived from the request URI, so changing it would cause a mismatch
- * between the filename we generate and the filename that WPSC generates.
- */
- $wp_cache_request_uri = $_SERVER['REQUEST_URI'];
- $wp_cache_gzip_encoding = '';
- $init_data = wp_super_cache_init();
- $cache_file = $blog_cache_dir . $init_data['cache_filename'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $cache_file = $blog_cache_dir . $cache_filename;
</ins><span class="cx" style="display: block; padding: 0 10px"> $tagregator_cache_expiration = 30; // seconds
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Prune the file if it's expired
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,6 +35,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $last_modified_time < time() - $tagregator_cache_expiration ) {
</span><span class="cx" style="display: block; padding: 0 10px"> unlink( $cache_file );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_cache_debug( "Pruned Tagregator cache file because it was older than $tagregator_cache_expiration seconds." );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>