Log headers sent errors more usefully in thumb.php

[lhc/web/wiklou.git] / opensearch_desc.php

diff --git a/opensearch_desc.php b/opensearch_desc.php
index b92ff2e..15ec62d 100644 (file)
--- a/opensearch_desc.php
+++ b/opensearch_desc.php
@@ -21,9 +21,8 @@
  */
 
 // This endpoint is supposed to be independent of request cookies and other
-// details of the session. Log warnings for violations of the no-session
-// constraint.
-define( 'MW_NO_SESSION', 'warn' );
+// details of the session. Enforce this constraint with respect to session use.
+define( 'MW_NO_SESSION', 1 );
 
 require_once __DIR__ . '/includes/WebStart.php';
 
@@ -37,7 +36,7 @@ if ( $wgRequest->getVal( 'ctype' ) == 'application/xml' ) {
 $response = $wgRequest->response();
 $response->header( "Content-type: $ctype" );
 
-// Set an Expires header so that squid can cache it for a short time
+// Set an Expires header so that CDN can cache it for a short time
 // Short enough so that the sysadmin barely notices when $wgSitename is changed
 $expiryTime = 600; # 10 minutes
 $response->header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', time() + $expiryTime ) . ' GMT' );
@@ -46,8 +45,8 @@ $response->header( 'Cache-control: max-age=600' );
 print '<?xml version="1.0"?>';
 print Xml::openElement( 'OpenSearchDescription',
        [
-               'xmlns' => 'http://www.opensearch.org/Specifications/OpenSearch/1.1',
-               'xmlns:moz' => 'https://www.mozilla.org/2006/browser/search/' ] );
+               'xmlns' => 'http://a9.com/-/spec/opensearch/1.1/',
+               'xmlns:moz' => 'http://www.mozilla.org/2006/browser/search/' ] );
 
 /* The spec says the ShortName must be no longer than 16 characters,
  * but 16 is *realllly* short. In practice, browsers don't appear to care