r67831 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r67830‎ | r67831 | r67832 >
Date:19:15, 10 June 2010
Author:jdpond
Status:ok (Comments)
Tags:
Comment:
(Bug 23767)PHP warning/error when REQUEST_URI returns blank (IIS issue)
Modified paths:
  • /branches/REL1_16/phase3/RELEASE-NOTES (modified) (history)
  • /branches/REL1_16/phase3/includes/WebRequest.php (modified) (history)

Diff [purge]

Index: branches/REL1_16/phase3/includes/WebRequest.php
——@@ -436,7 +436,7 @@
437437 * @return string
438438 */
439439 public function getRequestURL() {
440 - if( isset( $_SERVER['REQUEST_URI'] ) ) {
 440+ if( isset( $_SERVER['REQUEST_URI']) && strlen($_SERVER['REQUEST_URI']) ) {
441441 $base = $_SERVER['REQUEST_URI'];
442442 } elseif( isset( $_SERVER['SCRIPT_NAME'] ) ) {
443443 // Probably IIS; doesn't set REQUEST_URI
Index: branches/REL1_16/phase3/RELEASE-NOTES
——@@ -52,6 +52,7 @@
5353 * Fixed HTTP client functionality with safe_mode=On.
5454 * Fixed parser tests broken in 1.16 beta 3.
5555 * For Oracle DB backend: fixed parser tests and table prefix feature.
 56+* (bug 23767) PHP warning/error when REQUEST_URI returns blank (IIS issue).
5657
5758 == Changes since 1.16 beta 2 ==
5859

Follow-up revisions

RevisionCommit summaryAuthorDate
r67841Recorded mergeinfo for r67831 and fixed release notes.tstarling06:31, 11 June 2010

Comments

#Comment by Tim Starling (talk | contribs)   06:21, 11 June 2010

Please commit changes to trunk and then backport to 1.16. Do not commit changes directly to 1.16.

#Comment by Tim Starling (talk | contribs)   06:27, 11 June 2010

Let me modify that: please reference the trunk commit (r67828) in your commit message, and use "svn merge" with Subversion 1.5 or later to record the merged revision in the svn:mergeinfo property.

Status & tagging log