jenkins-bot has submitted this change and it was merged.
Change subject: action=history should return 404 if there is no such page
......................................................................
action=history should return 404 if there is no such page
Respects $wgSend404Code if configured.
Bug: T146496
Change-Id: I158aae3633db56d432f772ee0aa22c39fd6dc7e5
---
M RELEASE-NOTES-1.28
M includes/actions/HistoryAction.php
2 files changed, 6 insertions(+), 0 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
BBlack: Looks good to me, but someone else must approve
diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28
index a24f97a..812f309 100644
--- a/RELEASE-NOTES-1.28
+++ b/RELEASE-NOTES-1.28
@@ -6,6 +6,7 @@
production.
=== Configuration changes in 1.28 ===
+* $wgSend404Code now affects status code of action=history if the page is not
there.
* BREAKING CHANGE: $wgHTTPProxy is now *required* for all external requests
made by MediaWiki via a proxy. Relying on the http_proxy environment
variable is no longer supported.
@@ -71,6 +72,7 @@
==== Removed and replaced external libraries ====
=== Bug fixes in 1.28 ===
+* (T146496) action=history pages should return 404 HTTP error code if the page
does not exist
* (T137264) SECURITY: XSS in unclosed internal links
* (T133147) SECURITY: Escape '<' and ']]>' in inline <style> blocks
* (T133147) SECURITY: Require login to preview user CSS pages
diff --git a/includes/actions/HistoryAction.php
b/includes/actions/HistoryAction.php
index f3ef3b3..1e1bb39 100644
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -139,6 +139,10 @@
// Fail nicely if article doesn't exist.
if ( !$this->page->exists() ) {
+ global $wgSend404Code;
+ if ( $wgSend404Code ) {
+ $out->setStatusCode( 404 );
+ }
$out->addWikiMsg( 'nohistory' );
# show deletion/move log if there is an entry
LogEventsList::showLogExtract(
--
To view, visit https://gerrit.wikimedia.org/r/312561
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I158aae3633db56d432f772ee0aa22c39fd6dc7e5
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: saper <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Ema <[email protected]>
Gerrit-Reviewer: Nuria <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
Gerrit-Reviewer: saper <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
