<!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 { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { 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>[17643] trunk:
Introduce a special wp_die handler for XMLRPC requests to ensure we send an XML response
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17643">17643</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2011-04-17 08:35:51 +0000 (Sun, 17 Apr 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce a special wp_die handler for XMLRPC requests to ensure we send an XML response.
Props koke for the original patch. See <a href="http://trac.wordpress.org/ticket/16748">#16748</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkxmlrpcphp">trunk/xmlrpc.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (17642 => 17643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2011-04-17 07:48:34 UTC (rev 17642)
+++ trunk/wp-includes/functions.php 2011-04-17 08:35:51 UTC (rev 17643)
</span><span class="lines">@@ -2855,6 +2855,42 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Kill WordPress execution and display XML message with error message.
+ *
+ * This is the handler for wp_die when processing XMLRPC requests.
+ *
+ * @since 3.2.0
+ * @access private
+ *
+ * @param string $message Error message.
+ * @param string $title Error title.
+ * @param string|array $args Optional arguements to control behaviour.
+ */
+function _xmlrpc_wp_die_handler( $message, $title = '', $args = array() ) {
+ global $wp_xmlrpc_server;
+ $defaults = array( 'response' => 500 );
+
+ $r = wp_parse_args($args, $defaults);
+
+ if ( $wp_xmlrpc_server ) {
+ $error = new IXR_Error( $r['response'] , $message);
+ $wp_xmlrpc_server->output( $error->getXml() );
+ }
+ die();
+}
+
+/**
+ * Filter to enable special wp_die handler for xmlrpc requests.
+ *
+ * @since 3.2.0
+ * @access private
+ */
+function _xmlrpc_wp_die_filter() {
+ return '_xmlrpc_wp_die_handler';
+}
+
+
+/**
</ins><span class="cx"> * Retrieve the WordPress home page URL.
</span><span class="cx"> *
</span><span class="cx"> * If the constant named 'WP_HOME' exists, then it willl be used and returned by
</span></span></pre></div>
<a id="trunkxmlrpcphp"></a>
<div class="modfile"><h4>Modified: trunk/xmlrpc.php (17642 => 17643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/xmlrpc.php 2011-04-17 07:48:34 UTC (rev 17642)
+++ trunk/xmlrpc.php 2011-04-17 08:35:51 UTC (rev 17643)
</span><span class="lines">@@ -98,6 +98,9 @@
</span><span class="cx"> if ( isset($HTTP_RAW_POST_DATA) )
</span><span class="cx"> logIO("I", $HTTP_RAW_POST_DATA);
</span><span class="cx">
</span><ins>+// Make sure wp_die output is XML
+add_filter( 'wp_die_handler', '_xmlrpc_wp_die_filter' );
+
</ins><span class="cx"> // Allow for a plugin to insert a different class to handle requests.
</span><span class="cx"> $wp_xmlrpc_server_class = apply_filters('wp_xmlrpc_server_class', 'wp_xmlrpc_server');
</span><span class="cx"> $wp_xmlrpc_server = new $wp_xmlrpc_server_class;
</span></span></pre>
</div>
</div>
</body>
</html>