<!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>[2287] 2013/rmccue/trunk/lib: Always send headers via the server handler</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">
<dt>Revision</dt> <dd><a href="http://gsoc.trac.wordpress.org/changeset/2287">2287</a></dd>
<dt>Author</dt> <dd>rmccue</dd>
<dt>Date</dt> <dd>2013-09-11 15:45:00 +0000 (Wed, 11 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Always send headers via the server handler
Fixes <a href="http://gsoc.trac.wordpress.org/ticket/293">#293</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#2013rmccuetrunklibclasswpjsonmediaphp">2013/rmccue/trunk/lib/class-wp-json-media.php</a></li>
<li><a href="#2013rmccuetrunklibclasswpjsonpostsphp">2013/rmccue/trunk/lib/class-wp-json-posts.php</a></li>
<li><a href="#2013rmccuetrunklibclasswpjsonserverphp">2013/rmccue/trunk/lib/class-wp-json-server.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="2013rmccuetrunklibclasswpjsonmediaphp"></a>
<div class="modfile"><h4>Modified: 2013/rmccue/trunk/lib/class-wp-json-media.php (2286 => 2287)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/rmccue/trunk/lib/class-wp-json-media.php 2013-09-11 14:34:36 UTC (rev 2286)
+++ 2013/rmccue/trunk/lib/class-wp-json-media.php 2013-09-11 15:45:00 UTC (rev 2287)
</span><span class="lines">@@ -235,8 +235,8 @@
</span><span class="cx"> wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- status_header( 201 );
- header( 'Location: ' . json_url( '/media/' . $id ) );
</del><ins>+ $wp_json_server->send_status( 201 );
+ $wp_json_server->header( 'Location', json_url( '/media/' . $id ) );
</ins><span class="cx"> return $this->getPost( $id, 'edit' );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="2013rmccuetrunklibclasswpjsonpostsphp"></a>
<div class="modfile"><h4>Modified: 2013/rmccue/trunk/lib/class-wp-json-posts.php (2286 => 2287)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/rmccue/trunk/lib/class-wp-json-posts.php 2013-09-11 14:34:36 UTC (rev 2286)
+++ 2013/rmccue/trunk/lib/class-wp-json-posts.php 2013-09-11 15:45:00 UTC (rev 2287)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> // holds all the posts data
</span><span class="cx"> $struct = array();
</span><span class="cx">
</span><del>- header( 'Last-Modified: ' . mysql2date( 'D, d M Y H:i:s', get_lastpostmodified( 'GMT' ), 0 ).' GMT' );
</del><ins>+ $wp_json_server->header( 'Last-Modified', mysql2date( 'D, d M Y H:i:s', get_lastpostmodified( 'GMT' ), 0 ).' GMT' );
</ins><span class="cx">
</span><span class="cx"> foreach ( $posts_list as $post ) {
</span><span class="cx"> $post = get_object_vars( $post );
</span><span class="lines">@@ -184,12 +184,13 @@
</span><span class="cx"> * @return array Post data (see {@see WP_JSON_Posts::getPost})
</span><span class="cx"> */
</span><span class="cx"> function newPost( $data ) {
</span><ins>+ global $wp_json_server;
</ins><span class="cx"> unset( $data['ID'] );
</span><span class="cx">
</span><span class="cx"> $result = $this->insert_post( $data );
</span><span class="cx"> if ( is_string( $result ) || is_int( $result ) ) {
</span><del>- status_header( 201 );
- header( 'Location: ' . json_url( '/posts/' . $result ) );
</del><ins>+ $wp_json_server->send_status( 201 );
+ $wp_json_server->header( 'Location', json_url( '/posts/' . $result ) );
</ins><span class="cx">
</span><span class="cx"> return $this->getPost( $result );
</span><span class="cx"> }
</span><span class="lines">@@ -227,7 +228,7 @@
</span><span class="cx">
</span><span class="cx"> // Link headers (see RFC 5988)
</span><span class="cx">
</span><del>- header( 'Last-Modified: ' . mysql2date( 'D, d M Y H:i:s', $post['post_modified_gmt'] ) . 'GMT' );
</del><ins>+ $wp_json_server->header( 'Last-Modified', mysql2date( 'D, d M Y H:i:s', $post['post_modified_gmt'] ) . 'GMT' );
</ins><span class="cx">
</span><span class="cx"> $post = $this->prepare_post( $post, $context );
</span><span class="cx"> if ( is_wp_error( $post ) )
</span></span></pre></div>
<a id="2013rmccuetrunklibclasswpjsonserverphp"></a>
<div class="modfile"><h4>Modified: 2013/rmccue/trunk/lib/class-wp-json-server.php (2286 => 2287)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/rmccue/trunk/lib/class-wp-json-server.php 2013-09-11 14:34:36 UTC (rev 2286)
+++ 2013/rmccue/trunk/lib/class-wp-json-server.php 2013-09-11 15:45:00 UTC (rev 2287)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> */
</span><span class="cx"> protected function json_error( $code, $message, $status = null ) {
</span><span class="cx"> if ( $status )
</span><del>- status_header( $status );
</del><ins>+ $this->send_status( $status );
</ins><span class="cx">
</span><span class="cx"> $error = compact( 'code', 'message' );
</span><span class="cx"> return json_encode( array( $error ) );
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> * @uses WP_JSON_Server::dispatch()
</span><span class="cx"> */
</span><span class="cx"> public function serve_request( $path = null ) {
</span><del>- header( 'Content-Type: application/json; charset=' . get_option( 'blog_charset' ), true );
</del><ins>+ $this->header( 'Content-Type', 'application/json; charset=' . get_option( 'blog_charset' ), true );
</ins><span class="cx">
</span><span class="cx"> // Proper filter for turning off the JSON API. It is on by default.
</span><span class="cx"> $enabled = apply_filters( 'json_enabled', true );
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx"> if ( is_wp_error( $result ) ) {
</span><span class="cx"> $data = $result->get_error_data();
</span><span class="cx"> if ( is_array( $data ) && isset( $data['status'] ) ) {
</span><del>- status_header( $data['status'] );
</del><ins>+ $this->send_status( $data['status'] );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $result = $this->error_to_array( $result );
</span><span class="lines">@@ -434,6 +434,26 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Send a HTTP status code
+ *
+ * @param int $code HTTP status
+ */
+ public function send_status( $code ) {
+ status_header( $code );
+ }
+
+ /**
+ * Send a HTTP header
+ *
+ * @param string $key Header key
+ * @param string $value Header value
+ * @param boolean $replace Should we replace the existing header?
+ */
+ public function header( $key, $value, $replace = true ) {
+ header( sprintf( '%s: %s', $key, $value ), $replace );
+ }
+
+ /**
</ins><span class="cx"> * Send a Link header
</span><span class="cx"> *
</span><span class="cx"> * @todo Make this safe for <>"';,
</span><span class="lines">@@ -453,7 +473,7 @@
</span><span class="cx"> $value = '"' . $value . '"';
</span><span class="cx"> $header .= '; ' . $key . '=' . $value;
</span><span class="cx"> }
</span><del>- header( $header, false );
</del><ins>+ $this->header( 'Link', $header, false );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>