<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#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>
<title>[11826] trunk:
Increase timeout on cron-based requests when checking for upgrades,
props dd32, fixes #10349</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/11826">11826</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2009-08-16 04:59:38 +0000 (Sun, 16 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Increase timeout on cron-based requests when checking for upgrades, props dd32, fixes <a href="http://trac.wordpress.org/ticket/10349">#10349</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcronphp">trunk/wp-cron.php</a></li>
<li><a href="#trunkwpincludesupdatephp">trunk/wp-includes/update.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcronphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-cron.php (11825 => 11826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-cron.php        2009-08-16 04:50:10 UTC (rev 11825)
+++ trunk/wp-cron.php        2009-08-16 04:59:38 UTC (rev 11826)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> if ( isset($keys[0]) && $keys[0] > $local_time )
</span><span class="cx">         die();
</span><span class="cx">
</span><del>-foreach ($crons as $timestamp => $cronhooks) {
</del><ins>+foreach ($crons as $timestamp => $cronhooks) {
</ins><span class="cx">         if ( $timestamp > $local_time )
</span><span class="cx">                 break;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/update.php (11825 => 11826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/update.php        2009-08-16 04:50:10 UTC (rev 11825)
+++ trunk/wp-includes/update.php        2009-08-16 04:59:38 UTC (rev 11826)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">         $url = "http://api.wordpress.org/core/version-check/1.3/?version=$wp_version&php=$php_version&locale=$locale&mysql=$mysql_version&local_package=$local_package";
</span><span class="cx">
</span><span class="cx">         $options = array(
</span><del>-                'timeout' => 3,
</del><ins>+                'timeout' => defined('DOING_CRON') && DOING_CRON ? 30 : 3,
</ins><span class="cx">                 'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
</span><span class="cx">         );
</span><span class="cx">
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx">         $to_send = (object)compact('plugins', 'active');
</span><span class="cx">
</span><span class="cx">         $options = array(
</span><del>-                'timeout' => 3,
</del><ins>+                'timeout' => defined('DOING_CRON') && DOING_CRON ? 30 : 3,
</ins><span class="cx">                 'body' => array( 'plugins' => serialize( $to_send ) ),
</span><span class="cx">                 'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
</span><span class="cx">         );
</span><span class="lines">@@ -240,7 +240,7 @@
</span><span class="cx">         $current_theme->template = get_option( 'template' );
</span><span class="cx">
</span><span class="cx">         $options = array(
</span><del>-                'timeout'                => 3,
</del><ins>+                'timeout' => defined('DOING_CRON') && DOING_CRON ? 30 : 3,
</ins><span class="cx">                 'body'                        => array( 'themes' => serialize( $themes ) ),
</span><span class="cx">                 'user-agent'        => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
</span><span class="cx">         );
</span><span class="lines">@@ -306,7 +306,7 @@
</span><span class="cx">         if( isset( $current->last_checked ) && 43200 > ( time( ) - $current->last_checked ) )
</span><span class="cx">                 return;
</span><span class="cx">
</span><del>-        wp_update_themes( );
</del><ins>+        wp_update_themes();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> add_action( 'admin_init', '_maybe_update_core' );
</span></span></pre>
</div>
</div>
</body>
</html>