r110025 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r110024‎ | r110025 | r110026 >
Date:20:00, 25 January 2012
Author:tstarling
Status:ok
Tags:
Comment:
Merged r110024 from 1.18wmf1
Modified paths:
  • /trunk/extensions/TrustedXFF (modified) (history)
  • /trunk/extensions/TrustedXFF/trusted-hosts.txt (modified) (history)
  • /trunk/extensions/TrustedXFF/update (modified) (history)

Diff [purge]

Index: trunk/extensions/TrustedXFF/update
@@ -3,6 +3,7 @@
44 cd `dirname $0`
55 mwscript extensions/TrustedXFF/generate.php aawiki ../../cache/trusted-xff.cdb
66 bzip2 -kf ../../cache/trusted-xff.cdb
7 -if [ -x /home/wikipedia/bin/sync-common-file ]; then
8 - sync-common-file wmf-deployment/cache/trusted-xff.cdb
 7+if [ -x /usr/local/bin/sync-common-file ]; then
 8+ version="`readlink /home/wikipedia/common/php`"
 9+ sync-common-file "$version"/cache/trusted-xff.cdb
910 fi
Property changes on: trunk/extensions/TrustedXFF/trusted-hosts.txt
___________________________________________________________________
Modified: svn:mergeinfo
1011 Merged /branches/wmf/1.18wmf1/extensions/TrustedXFF/trusted-hosts.txt:r110024
Property changes on: trunk/extensions/TrustedXFF
___________________________________________________________________
Modified: svn:mergeinfo
1112 Merged /branches/wmf/1.18wmf1/extensions/TrustedXFF:r110024

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r110024More updates for 1.18tstarling19:58, 25 January 2012

Status & tagging log