date:20120426

[MediaWiki-CVS] SVN: [115059] trunk/translatewiki/MediaWiki/mediawiki-defines.txt

2012-04-26 Thread raymond

https://www.mediawiki.org/wiki/Special:Code/MediaWiki/115059

Revision: 115059
Author:   raymond
Date: 2012-04-26 06:05:03 + (Thu, 26 Apr 2012)
Log Message:
---
Mark messages to ignore: 
https://gerrit.wikimedia.org/r/#patch,unified,5803,6,ArticleFeedbackv5.i18n.php

Modified Paths:
--
trunk/translatewiki/MediaWiki/mediawiki-defines.txt

Modified: trunk/translatewiki/MediaWiki/mediawiki-defines.txt
===
--- trunk/translatewiki/MediaWiki/mediawiki-defines.txt 2012-04-26 04:46:49 UTC 
(rev 115058)
+++ trunk/translatewiki/MediaWiki/mediawiki-defines.txt 2012-04-26 06:05:03 UTC 
(rev 115059)
@@ -99,6 +99,8 @@
 ignored = articlefeedbackv5-noteflyover-unrequestoversight-help-link, 
articlefeedbackv5-noteflyover-oversight-help-link, 
articlefeedbackv5-noteflyover-ovesight-help-link
 ignored = articlefeedbackv5-noteflyover-declineoversight-help-link, 
articlefeedbackv5-noteflyover-unoversight-help-link
 ignored = articlefeedbackv5-activity-item, articlefeedbackv5-default-user
+ignored = articlefeedbackv5-noteflyover-feature-help-link, 
articlefeedbackv5-noteflyover-unfeature-help-link
+ignored = articlefeedbackv5-noteflyover-resolve-help-link, 
articlefeedbackv5-noteflyover-unresolve-help-link
 
 Article To Category 2
 


___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

[MediaWiki-CVS] SVN: [115060] trunk/tools/planet/zh/config.ini

2012-04-26 Thread liangent

https://www.mediawiki.org/wiki/Special:Code/MediaWiki/115060

Revision: 115060
Author:   liangent
Date: 2012-04-26 06:54:14 + (Thu, 26 Apr 2012)
Log Message:
---
I'm confused where the config file in use currently is. Just try to clean up 
this file by removing UTF-8 BOM and adding trailing newline and see what 
happens.

Modified Paths:
--
trunk/tools/planet/zh/config.ini

Modified: trunk/tools/planet/zh/config.ini
===
--- trunk/tools/planet/zh/config.ini2012-04-26 06:05:03 UTC (rev 115059)
+++ trunk/tools/planet/zh/config.ini2012-04-26 06:54:14 UTC (rev 115060)
@@ -1,4 +1,4 @@
-# Planet configuration file - zh.planet.wikimedia.org
+# Planet configuration file - zh.planet.wikimedia.org
 
 # Every planet needs a [Planet] section
 [Planet]
@@ -135,4 +135,4 @@
 name = 春卷柯南
 
 [http://taipei-wikipedian.blogspot.com/feeds/posts/default?alt=rss]
-name = 台北維基人聯合部落格
\ No newline at end of file
+name = 台北維基人聯合部落格


___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

[MediaWiki-CVS] SVN: [115061] trunk/tools/planet/zh/config.ini

2012-04-26 Thread liangent

https://www.mediawiki.org/wiki/Special:Code/MediaWiki/115061

Revision: 115061
Author:   liangent
Date: 2012-04-26 07:09:36 + (Thu, 26 Apr 2012)
Log Message:
---
Remove ?alt=rss

Modified Paths:
--
trunk/tools/planet/zh/config.ini

Modified: trunk/tools/planet/zh/config.ini
===
--- trunk/tools/planet/zh/config.ini2012-04-26 06:54:14 UTC (rev 115060)
+++ trunk/tools/planet/zh/config.ini2012-04-26 07:09:36 UTC (rev 115061)
@@ -134,5 +134,5 @@
 
[http://springrollconan.wordpress.com/category/%E7%B6%AD%E5%9F%BA%E9%83%A8/feed/]
 name = 春卷柯南
 
-[http://taipei-wikipedian.blogspot.com/feeds/posts/default?alt=rss]
+[http://taipei-wikipedian.blogspot.com/feeds/posts/default]
 name = 台北維基人聯合部落格


___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

[MediaWiki-CVS] SVN: [115062] trunk/extensions/SolrStore/templates/SolrSearchTemplate_FIS. php

2012-04-26 Thread schuellersa

https://www.mediawiki.org/wiki/Special:Code/MediaWiki/115062

Revision: 115062
Author:   schuellersa
Date: 2012-04-26 08:29:22 + (Thu, 26 Apr 2012)
Log Message:
---
undef var // BUGFIX

Modified Paths:
--
trunk/extensions/SolrStore/templates/SolrSearchTemplate_FIS.php

Modified: trunk/extensions/SolrStore/templates/SolrSearchTemplate_FIS.php
===
--- trunk/extensions/SolrStore/templates/SolrSearchTemplate_FIS.php 
2012-04-26 07:09:36 UTC (rev 115061)
+++ trunk/extensions/SolrStore/templates/SolrSearchTemplate_FIS.php 
2012-04-26 08:29:22 UTC (rev 115062)
@@ -234,7 +234,7 @@
unset( $leerat 
);
for ( $wlpos = 
0; $wlpos = strlen( $_REQUEST[ $feldname ] ); $wlpos++ ) { // wo sind die 
leerzeichen ?
if ( 
substr( $_REQUEST[ $feldname ], $wlpos, 1 ) ==   ) {
-   
$leerat[ ].=$wlpos;
+   
$leerat[ ]=$wlpos;
}
}
for ( $wpos = 
1; $wpos = $wcount; $wpos++ ) {
@@ -331,7 +331,7 @@
unset( $leerat 
);
for ( $wlpos = 
0; $wlpos = strlen( $_REQUEST[ $feldname ] ); $wlpos++ ) { // wo sind die 
leerzeichen ?
if ( 
substr( $_REQUEST[ $feldname ], $wlpos, 1 ) ==   ) {
-   
$leerat[ ].=$wlpos;
+   
$leerat[ ]=$wlpos;
}
}
for ( $wpos = 
1; $wpos = $wcount; $wpos++ ) {


___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

[MediaWiki-CVS] SVN: [115063] trunk/wikistats/squids/SquidReportArchive.pl

2012-04-26 Thread a_engels

https://www.mediawiki.org/wiki/Special:Code/MediaWiki/115063

Revision: 115063
Author:   a_engels
Date: 2012-04-26 09:44:02 + (Thu, 26 Apr 2012)
Log Message:
---
new version with Erik's suggestions

Modified Paths:
--
trunk/wikistats/squids/SquidReportArchive.pl

Modified: trunk/wikistats/squids/SquidReportArchive.pl
===
--- trunk/wikistats/squids/SquidReportArchive.pl2012-04-26 08:29:22 UTC 
(rev 115062)
+++ trunk/wikistats/squids/SquidReportArchive.pl2012-04-26 09:44:02 UTC 
(rev 115063)
@@ -4766,7 +4766,7 @@
my ($value, $ismarked) = @_;
if ($ismarked)
{
- $shownumber = ShowCount ($value * $multiplier, $marker_color) ;
+ $shownumber = ShowCount ($value * $multiplier, $ismarked) ;
}
else
{
@@ -4780,9 +4780,11 @@
my ($value, $compare, $showperc, $ismarked) = @_;
if (!$showperc)
{ return tdnbsp;/td ; }
-   if ($ismarked)
+   if ($value  1)
+   { $shownumber = '-' }
+   elsif ($ismarked)
{
- $shownumber = ShowPerc (100 * $value * $multiplier / $compare, 
$marker_color) ;
+ $shownumber = ShowPerc (100 * $value * $multiplier / $compare, 
$ismarked) ;
}
else
{
@@ -4799,21 +4801,23 @@
   { $ result .= td rowspan=$sharecolnbsp;nbsp;/td ; }
   my $colspan = 4 - $depth;
   if ($ismarked)
+  { $ismarked = $marker_color ; }
+  if ($ismarked)
   { $result .= td class=lt colspan=$colspanb$title/b/td ; }
   else
   { $result .= td class=lt colspan=$colspan$title/td ; }
   #$result .= tdnbsp;/td ;
   $result .= UserAgentField($countua {$code, 'M', 'page', '.'} + $countua 
{$code, 'W', 'page', '.'}, $ismarked) ;
   $result .= UserAgentFieldPerc($countua {$code, 'M', 'page', '.'} + $countua 
{$code, 'W', 'page', '.'}, $total_html, $showperc, $ismarked) ;
-  $result .= UserAgentField($countua {$code, 'M', 'page', '.'}, $ismarked) ;
-  $result .= UserAgentField($countua {$code, 'W', 'page', '.'}, $ismarked) ;
+  $result .= UserAgentFieldPerc($countua {$code, 'M', 'page', '.'}, 
$total_html, $showperc, $ismarked) ;
+  $result .= UserAgentFieldPerc($countua {$code, 'W', 'page', '.'}, 
$total_html, $showperc, $ismarked) ;
+  $result .= UserAgentFieldPerc($countua {$code, '.', '.', 'opensearch'}, 
$total_opensearch, $showperc, '#808080') ;
   #$result .= tdnbsp;/td ;
   $result .= UserAgentField($countua {$code, '.', '.', '.'}, $ismarked) ;
   $result .= UserAgentFieldPerc($countua {$code, '.', '.', '.'}, $total_count, 
$showperc, $ismarked) ;
-  $result .= UserAgentField($countua {$code, 'M', '.', '.'}, $ismarked) ;
-  $result .= UserAgentField($countua {$code, 'W', '.', '.'}, $ismarked) ;
-  $result .= UserAgentField($countua {$code, 'X', '.', '.'}, $ismarked) ;
-  $result .= UserAgentFieldPerc($countua {$code, '.', '.', 'opensearch'}, 
$total_opensearch, $showperc, $ismarked) ;
+  $result .= UserAgentFieldPerc($countua {$code, 'M', '.', '.'}, $total_count, 
$showperc, $ismarked) ;
+  $result .= UserAgentFieldPerc($countua {$code, 'W', '.', '.'}, $total_count, 
$showperc, $ismarked) ;
+  $result .= UserAgentFieldPerc($countua {$code, 'X', '.', '.'}, $total_count, 
$showperc, $ismarked) ;
   return $result ;
 }
 
@@ -4825,12 +4829,14 @@
   { $ result .= td rowspan=$sharecolnbsp;nbsp;/td ; }
   my $colspan = 2 - $depth;
   if ($ismarked)
+  { $ismarked = $marker_color ; }
+  if ($ismarked)
   { $result .= td class=lt colspan=$colspanb$title/b/td ; }
   else
   { $result .= td class=lt colspan=$colspan$title/td ; }
   $result .= UserAgentFieldPerc($countua {$code, 'M', 'page', '.'} + $countua 
{$code, 'W', 'page', '.'}, $total_mobile_html, $true, $ismarked) ;
   $result .= UserAgentFieldPerc($countua {$code, '.', '.', '.'}, 
$total_mobile, $true, $ismarked) ;
-  $result .= UserAgentFieldPerc($countua {$code, '.', '.', 'opensearch'}, 
$mobile_opensearch, $true, $ismarked) ;
+  $result .= UserAgentFieldPerc($countua {$code, '.', '.', 'opensearch'}, 
$mobile_opensearch, $true, '#808080') ;
   return $result ;
 }
 
@@ -4852,9 +4858,9 @@
 
   $html .= table border=1\n ;
  
-  $html .= trth class=l valign='top' rowspan=2 colspan=4nbsp;/thth 
rowspan=16nbsp;/thth class=c colspan=4Page views/thth 
rowspan=16nbsp;/thth class=c colspan=5All requests/thth 
rowspan=16nbsp;/ththOpensearcha 
href='#explain_search'[1]/a/th/tr\n ;
-  $html .= trth class=cTotal/thth class=cPercentage/thth 
class=cTo mobile/thth class=cTo main site/th ;
-  $html .= th class=cTotal/thth class=cPercentage/thth class=cTo 
mobile/thth class=cTo main site/thth class=cTo other serversa 
href='#explain_other'[2]/a/thth class=cPercentage/th/tr\n ;
+  $html .= trth class=l valign='top' rowspan=2 colspan=4nbsp;/thth 
rowspan=16nbsp;/thth class=c colspan=5Page views/thth 
rowspan=16nbsp;/thth class=c colspan=5All requests/thth 
rowspan=16nbsp;/th/tr\n ;
+  $html .= trth class=cTotal/thth class=cPercentage/thth 
class=cTo mobile/thth class=cTo main site/thth class=cSearch-based 
estimatea

[MediaWiki-CVS] SVN: [115064] trunk/extensions

2012-04-26 Thread raymond

https://www.mediawiki.org/wiki/Special:Code/MediaWiki/115064

Revision: 115064
Author:   raymond
Date: 2012-04-26 19:25:17 + (Thu, 26 Apr 2012)
Log Message:
---
Localisation updates from http://translatewiki.net.

Modified Paths:
--
trunk/extensions/AbsenteeLandlord/AbsenteeLandlord.i18n.php
trunk/extensions/AmazonPlus/AmazonPlus.i18n.php
trunk/extensions/CodeEditor/CodeEditor.i18n.php
trunk/extensions/Configure/Configure.i18n.php
trunk/extensions/Configure/settings/Settings.i18n.php

trunk/extensions/ConfirmAccount/frontend/language/ConfirmAccountPage.i18n.php

trunk/extensions/ConfirmAccount/frontend/language/UserCredentialsPage.i18n.php
trunk/extensions/Contributors/Contributors.i18n.php
trunk/extensions/MassBlank/MassBlank.i18n.php
trunk/extensions/OpenID/OpenID.i18n.php
trunk/extensions/QPoll/i18n/qp.i18n.php
trunk/extensions/SemanticForms/languages/SF_Messages.php
trunk/extensions/SideBarMenu/SideBarMenu.i18n.php
trunk/extensions/WhiteListEdit/WhiteListEdit.i18n.php

Modified: trunk/extensions/AbsenteeLandlord/AbsenteeLandlord.i18n.php
===
--- trunk/extensions/AbsenteeLandlord/AbsenteeLandlord.i18n.php 2012-04-26 
09:44:02 UTC (rev 115063)
+++ trunk/extensions/AbsenteeLandlord/AbsenteeLandlord.i18n.php 2012-04-26 
19:25:17 UTC (rev 115064)
@@ -242,10 +242,11 @@
 
 /** Finnish (Suomi)
  * @author Jaakonam
+ * @author Pxos
  */
 $messages['fi'] = array(
'absenteelandlord-reason' = 'Tämä tietokanta on lukittu 
automaattisesti ylläpitäjien aktiivisuuden puutteen takia.',
-   'absenteelandlord-desc' = 'Lukitsee wikin tietokannan automaattisesti, 
jos ylläpitäjät eivät ole aktiivisia tiettyyn aikaan mennessä.',
+   'absenteelandlord-desc' = 'Lukitsee wikin tietokannan automaattisesti, 
jos kaikki ylläpitäjät ovat riittävän kauan aikaa tekemättä mitään.',
 );
 
 /** Faroese (Føroyskt)

Modified: trunk/extensions/AmazonPlus/AmazonPlus.i18n.php
===
--- trunk/extensions/AmazonPlus/AmazonPlus.i18n.php 2012-04-26 09:44:02 UTC 
(rev 115063)
+++ trunk/extensions/AmazonPlus/AmazonPlus.i18n.php 2012-04-26 19:25:17 UTC 
(rev 115064)
@@ -1324,10 +1324,25 @@
 );
 
 /** Pälzisch (Pälzisch)
+ * @author Manuae
  * @author Xqt
  */
 $messages['pfl'] = array(
+   'amazonplus-desc' = 'Ä schdaag oanpassbari Eawaidarung, fas oagugge 
vun Auskinfd vun Amazon',
+   'amazonplus-nores' = 'Fehla: Kä Ergewnis gfunne!',
+   'amazonplus-noidres' = 'Fehla: Kä ID vum Adiggl gfunne!',
+   'amazonplus-fgcerr' = Fehla: S'sin kä Daade vun Amazon kumme!,
+   'amazonplus-slserr' = Fehla: Daade vun Amazon hen ned va'awaided 
werre kenne!,
+   'amazonplus-used' = 'benuzd',
+   'amazonplus-german' = 'Daidsch',
+   'amazonplus-french' = 'Fronsesisch',
+   'amazonplus-japanese' = 'Japoanisch',
+   'amazonplus-amazon' = 'Brais bai Amazon',
+   'amazonplus-new' = 'nai',
+   'amazonplus-none' = S'hod dod'fu kä Adiggl zum vakaafe.,
'amazonplus-cp-none' = 'Kään',
+   'amazonplus-more' = 'waidari',
+   'amazonplus-less' = 'wenischa',
 );
 
 /** Polish (Polski)

Modified: trunk/extensions/CodeEditor/CodeEditor.i18n.php
===
--- trunk/extensions/CodeEditor/CodeEditor.i18n.php 2012-04-26 09:44:02 UTC 
(rev 115063)
+++ trunk/extensions/CodeEditor/CodeEditor.i18n.php 2012-04-26 19:25:17 UTC 
(rev 115064)
@@ -93,7 +93,7 @@
  */
 $messages['gl'] = array(
'codeeditor-desc' = 'Edición de páxinas en JavaScript e CSS con realce 
sintáctico que emprega o [http://ace.ajax.org/ editor Ace]',
-   'codeeditor-toolbar-toggle' = 'Conmutar o realce ou non de sintaxe',
+   'codeeditor-toolbar-toggle' = 'Activar ou desactivar o editor de 
código',
 );
 
 /** Hebrew (עברית)
@@ -157,7 +157,7 @@
  */
 $messages['lb'] = array(
'codeeditor-desc' = Ännere vu JavaScript an CSS-Säite mam 
[http://ace.ajax.org/ Ace editor] deen d'Syntax faarweg duerstellt,
-   'codeeditor-toolbar-toggle' = 'An- an ausschalte vun der faarweger 
Syntax',
+   'codeeditor-toolbar-toggle' = 'Editeur vum Code an- an ausschalten',
 );
 
 /** Limburgish (Limburgs)

Modified: trunk/extensions/Configure/Configure.i18n.php
===
--- trunk/extensions/Configure/Configure.i18n.php   2012-04-26 09:44:02 UTC 
(rev 115063)
+++ trunk/extensions/Configure/Configure.i18n.php   2012-04-26 19:25:17 UTC 
(rev 115064)
@@ -7644,7 +7644,7 @@
'configure-section-email' = 'Е-пошта',
'configure-section-enotif' = 'Известување по е-пошта',
'configure-section-localization' = 'Локализација',
-   'configure-section-timezone' = 'Часовна зона',
+   'configure-section-timezone' = 'Часовен појас',
'configure-section-debug' =

[MediaWiki-CVS] SVN: [115065] trunk/tools/mwmultiversion/multiversion/switchAllMediaWikis

2012-04-26 Thread aaron

https://www.mediawiki.org/wiki/Special:Code/MediaWiki/115065

Revision: 115065
Author:   aaron
Date: 2012-04-26 20:33:45 + (Thu, 26 Apr 2012)
Log Message:
---
r115026: keep the rows in the .dat file that did not matchthe replace.

Modified Paths:
--
trunk/tools/mwmultiversion/multiversion/switchAllMediaWikis

Modified: trunk/tools/mwmultiversion/multiversion/switchAllMediaWikis
===
--- trunk/tools/mwmultiversion/multiversion/switchAllMediaWikis 2012-04-26 
19:25:17 UTC (rev 115064)
+++ trunk/tools/mwmultiversion/multiversion/switchAllMediaWikis 2012-04-26 
20:33:45 UTC (rev 115065)
@@ -53,10 +53,14 @@
if ( isset( $dbList[$dbName] ) // wiki is in the .dblist file
 ( $version === $oldVersion || $oldVersion === 'all' 
) )
{
+   # Change the row and add it to the list
$newWikiVersionsData .= MWWikiversions::lineFromRow(
array( $dbName, $newVersion, $extVersion, 
$comment )
);
++$count;
+   } else {
+   # Just add the row back to the list
+   $newWikiVersionsData .= MWWikiversions::lineFromRow( 
$row );
}
}
 


___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

[MediaWiki-CVS] SVN: [115066] trunk/wikistats/squids/SquidCountArchive.pl

2012-04-26 Thread a_engels

https://www.mediawiki.org/wiki/Special:Code/MediaWiki/115066

Revision: 115066
Author:   a_engels
Date: 2012-04-26 20:38:53 + (Thu, 26 Apr 2012)
Log Message:
---
some undefs

Modified Paths:
--
trunk/wikistats/squids/SquidCountArchive.pl

Modified: trunk/wikistats/squids/SquidCountArchive.pl
===
--- trunk/wikistats/squids/SquidCountArchive.pl 2012-04-26 20:33:45 UTC (rev 
115065)
+++ trunk/wikistats/squids/SquidCountArchive.pl 2012-04-26 20:38:53 UTC (rev 
115066)
@@ -465,6 +465,8 @@
   undef $tot_referers_external ;
   undef $tot_referers_internal ;
   undef $unrecognized_domains ;
+  undef $useragents ;
+  undef $country_info ;
 
   undef %google_bot_hits ;
   undef %ip_bot_no_google ;


___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

[MediaWiki-CVS] SVN: [115067] trunk/debs/nginx

2012-04-26 Thread faidon

https://www.mediawiki.org/wiki/Special:Code/MediaWiki/115067

Revision: 115067
Author:   faidon
Date: 2012-04-26 21:36:27 + (Thu, 26 Apr 2012)
Log Message:
---
Fix a segfault when more than 2 udplog listeners are configured.

Modified Paths:
--
trunk/debs/nginx/debian/changelog
trunk/debs/nginx/debian/patches/udplog.diff
trunk/debs/nginx/modules/nginx-udplog/ngx_http_udplog_module.c

Modified: trunk/debs/nginx/debian/changelog
===
--- trunk/debs/nginx/debian/changelog   2012-04-26 20:38:53 UTC (rev 115066)
+++ trunk/debs/nginx/debian/changelog   2012-04-26 21:36:27 UTC (rev 115067)
@@ -1,3 +1,9 @@
+nginx (0.7.65-5wmf1) lucid-wikimedia; urgency=low
+
+  * Fix a segfault when more than 2 udplog listeners are configured.
+
+ -- Faidon Liambotis parav...@debian.org  Thu, 26 Apr 2012 14:35:03 -0700
+
 nginx (0.7.65-4wmf1) lucid-wikimedia; urgency=low
 
   * Applying fix for overly long user agents

Modified: trunk/debs/nginx/debian/patches/udplog.diff
===
--- trunk/debs/nginx/debian/patches/udplog.diff 2012-04-26 20:38:53 UTC (rev 
115066)
+++ trunk/debs/nginx/debian/patches/udplog.diff 2012-04-26 21:36:27 UTC (rev 
115067)
@@ -109,7 +109,7 @@
 +NGX_ADDON_SRCS=$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_udplog_module.c
 --- /dev/null
 +++ b/modules/nginx-udplog/ngx_http_udplog_module.c
-@@ -0,0 +1,682 @@
+@@ -0,0 +1,705 @@
 +
 +/*
 + * Copyright (C) 2010 Valery Kholodkov
@@ -159,8 +159,8 @@
 +} ngx_http_log_main_conf_t;
 +
 +typedef struct {
-+ngx_udplog_addr_t peer_addr;
-+ngx_udp_connection_t  *udp_connection;
++ngx_udplog_addr_t   peer_addr;
++ngx_udp_connection_t*udp_connection;
 +} ngx_udp_endpoint_t;
 +
 +typedef struct {
@@ -525,6 +525,11 @@
 +
 +uc = l-udp_connection;
 +
++if (uc == NULL) {
++/* this should *never* happen! */
++return NGX_ERROR;
++}
++
 +if (uc-connection == NULL) {
 +if(ngx_udp_connect(uc) != NGX_OK) {
 +return NGX_ERROR;
@@ -621,22 +626,40 @@
 +{
 +ngx_http_udplog_main_conf_t*umcf;
 +ngx_udp_endpoint_t *endpoint;
++ngx_udp_endpoint_t **e;
 +
++/* allocate a new endpoint from the pool and initialize it */
++#if defined nginx_version  nginx_version = 7003
++endpoint = ngx_pnalloc(cf-pool, sizeof(ngx_udp_endpoint_t));
++#else
++endpoint = ngx_palloc(cf-pool, sizeof(ngx_udp_endpoint_t));
++#endif
++if (endpoint == NULL) {
++return NULL;
++}
++
++endpoint-peer_addr = *peer_addr;
++
++/* save the pointer to this endpoint to an array, so that it can be
++ * enumerated on the endpoint initialization phase.
++ *
++ * Note that we can't use an array directly, since it may be relocated at
++ * any point and hence all pointers to its elements readdressed
++ */
 +umcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_udplog_module);
 +
 +if(umcf-endpoints == NULL) {
-+umcf-endpoints = ngx_array_create(cf-pool, 2, 
sizeof(ngx_udp_endpoint_t));
++umcf-endpoints = ngx_array_create(cf-pool, 2, 
sizeof(ngx_udp_endpoint_t *));
 +if (umcf-endpoints == NULL) {
 +return NULL;
 +}
 +}
-+
-+endpoint = ngx_array_push(umcf-endpoints);
-+if (endpoint == NULL) {
++e = ngx_array_push(umcf-endpoints);
++if (e == NULL) {
 +return NULL;
 +}
 +
-+endpoint-peer_addr = *peer_addr;
++*e = endpoint;
 +
 +return endpoint;
 +}
@@ -726,7 +749,7 @@
 +
 +log-endpoint = ngx_http_udplog_add_endpoint(cf, u.addrs[0]);
 +
-+if(log-endpoint == NULL) {
++if (log-endpoint == NULL) {
 +return NGX_CONF_ERROR;
 +}
 +
@@ -766,14 +789,14 @@
 +ngx_http_core_main_conf_t*cmcf;
 +ngx_http_udplog_main_conf_t  *umcf;
 +ngx_http_handler_pt  *h;
-+ngx_udp_endpoint_t   *e;
++ngx_udp_endpoint_t   **e;
 +
 +umcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_udplog_module);
 +
 +if(umcf-endpoints != NULL) {
 +e = umcf-endpoints-elts;
 +for(i = 0;i  umcf-endpoints-nelts;i++) {
-+rc = ngx_udplog_init_endpoint(cf, e + i);
++rc = ngx_udplog_init_endpoint(cf, e[i]);
 +
 +if(rc != NGX_OK) {
 +return NGX_ERROR;

Modified: trunk/debs/nginx/modules/nginx-udplog/ngx_http_udplog_module.c
===
--- trunk/debs/nginx/modules/nginx-udplog/ngx_http_udplog_module.c  
2012-04-26 20:38:53 UTC (rev 115066)
+++ trunk/debs/nginx/modules/nginx-udplog/ngx_http_udplog_module.c  
2012-04-26 21:36:27 UTC (rev 115067)
@@ -47,8 +47,8 @@
 } ngx_http_log_main_conf_t;
 
 typedef struct {
-ngx_udplog_addr_t peer_addr;
-ngx_udp_connection_t  *udp_connection;
+ngx_udplog_addr_t

[MediaWiki-CVS] SVN: [115068] trunk/debs/nginx/debian

2012-04-26 Thread faidon

https://www.mediawiki.org/wiki/Special:Code/MediaWiki/115068

Revision: 115068
Author:   faidon
Date: 2012-04-26 21:45:13 + (Thu, 26 Apr 2012)
Log Message:
---
Import nginx 0.7.65-1ubuntu2.1  0.7.65-1ubuntu2.2

Incorporate a security  a serious fix from Ubuntu into our own 5wmf1 version
of nginx. Three-way merge of debian/changelog, altering history a bit (which
still resides in our svn history, though).

Modified Paths:
--
trunk/debs/nginx/debian/changelog
trunk/debs/nginx/debian/patches/series

Added Paths:
---
trunk/debs/nginx/debian/patches/LP-902223.patch
trunk/debs/nginx/debian/patches/nginx-null_byte_in_urls.patch

Modified: trunk/debs/nginx/debian/changelog
===
--- trunk/debs/nginx/debian/changelog   2012-04-26 21:36:27 UTC (rev 115067)
+++ trunk/debs/nginx/debian/changelog   2012-04-26 21:45:13 UTC (rev 115068)
@@ -23,6 +23,22 @@
 
  -- Ryan Lane rl...@wikimedia.org  Thu, 23 Jun 2011 20:22:09 +
 
+nginx (0.7.65-1ubuntu2.2) lucid-proposed; urgency=low
+
+  * debian/patches/LP-902223.patch: Patch to fix reloading
+IPv6 addresses, patch derived from Debian. (LP: #902223)
+
+ -- Mahyuddin Susanto udi...@ubuntu.com  Thu, 12 Jan 2012 14:45:20 +0700
+
+nginx (0.7.65-1ubuntu2.1) lucid-security; urgency=low
+
+  * SECURITY UPDATE:
+- debian/patches/nginx-null_byte_in_urls.patch: Merge r3528 from
+  upstream repository to mitigate potential null byte vulnerability
+  (LP: #783508)
+
+ -- Neal Poole n...@nealpoole.com  Fri, 17 Jun 2011 20:44:44 -0400
+
 nginx (0.7.65-1ubuntu2) lucid; urgency=low
 
   * Re-enable http_realip_module (debian/rules).

Added: trunk/debs/nginx/debian/patches/LP-902223.patch
===
--- trunk/debs/nginx/debian/patches/LP-902223.patch 
(rev 0)
+++ trunk/debs/nginx/debian/patches/LP-902223.patch 2012-04-26 21:45:13 UTC 
(rev 115068)
@@ -0,0 +1,18 @@
+Description: Patch to fix reloading IPv6 addresses
+Author: Matthias-Christian Ott o...@mirix.org
+Bug-Debian: http://bugs.debian.org/577456
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/902223
+
+Index: nginx-0.7.65/src/core/ngx_cycle.c
+===
+--- nginx-0.7.65.orig/src/core/ngx_cycle.c 2009-10-26 23:22:24.0 
+0700
 nginx-0.7.65/src/core/ngx_cycle.c  2012-01-12 14:38:22.717490960 +0700
+@@ -847,7 +847,7 @@
+ sin61 = (struct sockaddr_in6 *) sa1;
+ sin62 = (struct sockaddr_in6 *) sa2;
+ 
+-if (sin61-sin6_port != sin61-sin6_port) {
++if (sin61-sin6_port != sin62-sin6_port) {
+ return NGX_DECLINED;
+ }
+ 

Added: trunk/debs/nginx/debian/patches/nginx-null_byte_in_urls.patch
===
--- trunk/debs/nginx/debian/patches/nginx-null_byte_in_urls.patch   
(rev 0)
+++ trunk/debs/nginx/debian/patches/nginx-null_byte_in_urls.patch   
2012-04-26 21:45:13 UTC (rev 115068)
@@ -0,0 +1,279 @@
+Description: Upstream changes introduced in version 0.7.65-1ubuntu3
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ nginx (0.7.65-1ubuntu3) lucid; urgency=low
+ .
+   * Merge r3528 from upstream repository to mitigate potential
+ null byte vulnerability (LP: #783508)
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Neal Poole n...@nealpoole.com
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/783508
+Origin: svn://svn.nginx.org/nginx/ rev 3528
+
+--- nginx-0.7.65.orig/src/http/ngx_http_special_response.c
 nginx-0.7.65/src/http/ngx_http_special_response.c
+@@ -517,8 +517,6 @@ ngx_http_send_error_page(ngx_http_reques
+ 
+ r-err_status = overwrite;
+ 
+-r-zero_in_uri = 0;
+-
+ if (ngx_http_complex_value(r, err_page-value, uri) != NGX_OK) {
+ return NGX_ERROR;
+ }
+--- nginx-0.7.65.orig/src/http/ngx_http_request.h
 nginx-0.7.65/src/http/ngx_http_request.h
+@@ -57,7 +57,7 @@
+ #define NGX_HTTP_PARSE_INVALID_HEADER  13
+ 
+ 
+-#define NGX_HTTP_ZERO_IN_URI   1
++/* unused  1 */
+ #define NGX_HTTP_SUBREQUEST_IN_MEMORY  2
+ #define NGX_HTTP_SUBREQUEST_WAITED 4
+ #define NGX_HTTP_LOG_UNSAFE8
+@@ -428,9 +428,6 @@ struct ngx_http_request_s {
+ /* URI with + */
+ unsigned  plus_in_uri:1;
+ 
+-/* URI with \0 or %00 */
+-unsigned  zero_in_uri:1;
+-
+ unsigned  invalid_header:1;
+ 
+ unsigned  valid_location:1;
+--- nginx-0.7.65.orig/src/http/ngx_http_upstream.c
 nginx-0.7.65/src/http/ngx_http_upstream.c
+@@ -1775,10 +1775,6 @@

[MediaWiki-CVS] SVN: [115069] trunk/extensions/OpenID

2012-04-26 Thread wikinaut

https://www.mediawiki.org/wiki/Special:Code/MediaWiki/115069

Revision: 115069
Author:   wikinaut
Date: 2012-04-26 23:50:06 + (Thu, 26 Apr 2012)
Log Message:
---
version 1.004 link to Special:Preferences tabs corrected; upd version nummer 
and readme

Modified Paths:
--
trunk/extensions/OpenID/OpenID.i18n.php
trunk/extensions/OpenID/OpenID.php
trunk/extensions/OpenID/README.OpenID-mediawiki-extension

Modified: trunk/extensions/OpenID/OpenID.i18n.php
===
--- trunk/extensions/OpenID/OpenID.i18n.php 2012-04-26 21:45:13 UTC (rev 
115068)
+++ trunk/extensions/OpenID/OpenID.i18n.php 2012-04-26 23:50:06 UTC (rev 
115069)
@@ -53,8 +53,8 @@
 
 Your OpenID is $2 .
 
-This and optional further OpenIDs can be managed in the 
[[Special:Preferences#prefsection-openid|OpenID tab]] of your preferences.br /
-An optional account password can be added in your 
[[Special:Preferences#prefsection-personal|User profile]].,
+This and optional further OpenIDs can be managed in the 
[[Special:Preferences#mw-prefsection-openid|OpenID tab]] of your 
preferences.br /
+An optional account password can be added in your 
[[Special:Preferences#mw-prefsection-personal|User profile]].,
'openidusernameprefix' = 'OpenIDUser',
'openidserverlogininstructions' = '$3 requests that you enter your 
password for your user $2 page $1 (this is your OpenID URL)',
'openidtrustinstructions' = 'Check if you want to share data with $1.',

Modified: trunk/extensions/OpenID/OpenID.php
===
--- trunk/extensions/OpenID/OpenID.php  2012-04-26 21:45:13 UTC (rev 115068)
+++ trunk/extensions/OpenID/OpenID.php  2012-04-26 23:50:06 UTC (rev 115069)
@@ -27,7 +27,7 @@
exit( 1 );
 }
 
-define( 'MEDIAWIKI_OPENID_VERSION', '1.002 20120310' );
+define( 'MEDIAWIKI_OPENID_VERSION', '1.004 20120427' );
 
 $path = dirname( __FILE__ );
 set_include_path( implode( PATH_SEPARATOR, array( $path ) ) . PATH_SEPARATOR . 
get_include_path() );

Modified: trunk/extensions/OpenID/README.OpenID-mediawiki-extension
===
--- trunk/extensions/OpenID/README.OpenID-mediawiki-extension   2012-04-26 
21:45:13 UTC (rev 115068)
+++ trunk/extensions/OpenID/README.OpenID-mediawiki-extension   2012-04-26 
23:50:06 UTC (rev 115069)
@@ -1,5 +1,5 @@
 MediaWiki OpenID extension README.OpenID-mediawiki-extension file
-version 1.001 20120220
+version 1.004 20120427
 Homepage and manual http://www.mediawiki.org/wiki/Extension:OpenID
 
 Please check OpenID.setup.php for the current program version number
@@ -461,6 +461,8 @@
   into that account now
 
 == CHANGES ==
+* 1.004 links to preferences tabs corrected
+* 1.003 changed system text openidalreadyloggedintext
 * 1.002 added missing system text 'right-openid-converter-access'
 * 1.001 convenience release with download of the version for PHP 5.3.x
from https://github.com/Wikinaut/php-openid/tree/mw-extension-openid


___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

[MediaWiki-CVS] SVN: [115070] trunk/php/luasandbox

2012-04-26 Thread tstarling

https://www.mediawiki.org/wiki/Special:Code/MediaWiki/115070

Revision: 115070
Author:   tstarling
Date: 2012-04-27 01:24:20 + (Fri, 27 Apr 2012)
Log Message:
---
* Aggregate CPU usage for limit measurement across all calls against a given 
sandbox object, instead of limiting per-call. Some interface changes were 
required. Now the timer is stored in the sandbox object instead of the stack, 
and it keeps track of its own limit settings.
* Provide LuaSandbox::getCPUUsage(), based on a separate timer so that it can 
run after the limits have expired, or if there are no limits set.
* Adjusted pcall.phpt to make new sandbox objects after a timeout

Modified Paths:
--
trunk/php/luasandbox/luasandbox.c
trunk/php/luasandbox/luasandbox_timer.h
trunk/php/luasandbox/php_luasandbox.h
trunk/php/luasandbox/tests/pcall.phpt
trunk/php/luasandbox/timer.c

Modified: trunk/php/luasandbox/luasandbox.c
===
--- trunk/php/luasandbox/luasandbox.c   2012-04-26 23:50:06 UTC (rev 115069)
+++ trunk/php/luasandbox/luasandbox.c   2012-04-27 01:24:20 UTC (rev 115070)
@@ -85,6 +85,9 @@
ZEND_ARG_INFO(0, emergency_limit)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_INFO(arginfo_luasandbox_getCPUUsage, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_INFO(arginfo_luasandbox_callFunction, 0)
ZEND_ARG_INFO(0, name)
ZEND_ARG_INFO(0, ...)
@@ -118,6 +121,7 @@
PHP_ME(LuaSandbox, setMemoryLimit, arginfo_luasandbox_setMemoryLimit, 0)
PHP_ME(LuaSandbox, getMemoryUsage, arginfo_luasandbox_getMemoryUsage, 0)
PHP_ME(LuaSandbox, setCPULimit, arginfo_luasandbox_setCPULimit, 0)
+   PHP_ME(LuaSandbox, getCPUUsage, arginfo_luasandbox_getCPUUsage, 0)
PHP_ME(LuaSandbox, callFunction, arginfo_luasandbox_callFunction, 0)
PHP_ME(LuaSandbox, registerLibrary, arginfo_luasandbox_registerLibrary, 
0)
{NULL, NULL, NULL}
@@ -262,21 +266,24 @@
  */
 static zend_object_value luasandbox_new(zend_class_entry *ce TSRMLS_DC)
 {
-   php_luasandbox_obj * intern;
+   php_luasandbox_obj * sandbox;
zend_object_value retval;
 
// Create the internal object
-   intern = emalloc(sizeof(php_luasandbox_obj));
-   memset(intern, 0, sizeof(php_luasandbox_obj));
-   zend_object_std_init(intern-std, ce TSRMLS_CC);
-   intern-alloc.memory_limit = (size_t)-1;
+   sandbox = emalloc(sizeof(php_luasandbox_obj));
+   memset(sandbox, 0, sizeof(php_luasandbox_obj));
+   zend_object_std_init(sandbox-std, ce TSRMLS_CC);
+   sandbox-alloc.memory_limit = (size_t)-1;
 
// Initialise the Lua state
-   intern-state = luasandbox_newstate(intern);
+   sandbox-state = luasandbox_newstate(sandbox);
 
+   // Initialise the timer
+   luasandbox_timer_create(sandbox-timer, sandbox);
+
// Put the object into the store
retval.handle = zend_objects_store_put(
-   intern,
+   sandbox,
(zend_objects_store_dtor_t)zend_objects_destroy_object, 
(zend_objects_free_object_storage_t)luasandbox_free_storage, 
NULL TSRMLS_CC);
@@ -325,15 +332,14 @@
  */
 static void luasandbox_free_storage(void *object TSRMLS_DC)
 {
-   php_luasandbox_obj * intern = (php_luasandbox_obj*)object;
+   php_luasandbox_obj * sandbox = (php_luasandbox_obj*)object;
 
-   if (intern-state) {
-   luasandbox_alloc_delete_state(intern-alloc, intern-state);
-   intern-state = NULL;
-   
-   intern-state = NULL;
+   luasandbox_timer_stop(sandbox-timer);
+   if (sandbox-state) {
+   luasandbox_alloc_delete_state(sandbox-alloc, sandbox-state);
+   sandbox-state = NULL;
}
-   zend_object_std_dtor(intern-std);
+   zend_object_std_dtor(sandbox-std);
efree(object);
 }
 /* }}} */
@@ -657,9 +663,9 @@
 
 /** {{{ proto void LuaSandbox::setCPULimit(mixed normal_limit, mixed 
emergency_limit = false)
  *
- * Set the limit of CPU time (user+system) for LuaSandboxFunction::call()
- * calls. There are two time limits, which are both specified in seconds. Set
- * a time limit to false to disable it.
+ * Set the limit of CPU time (user+system) for all LuaSandboxFunction::call()
+ * calls against this LuaSandbox instance. There are two time limits, which 
+ * are both specified in seconds. Set a time limit to false to disable it.
  *
  * When the normal time limit expires, a flag will be set which causes 
  * a LuaSandboxError exception to be thrown when the currently-running Lua 
@@ -671,6 +677,9 @@
  * running, the Lua state is destroyed and then recreated with an empty state. 
  * Any LuaSandboxFunction objects which referred to the old state will stop 
  * working. A LuaSandboxEmergencyTimeout exception is thrown.
+ *
+ * Setting the time limit from a callback while Lua is running causes the timer
+ * to be reset,

[MediaWiki-CVS] SVN: [115059] trunk/translatewiki/MediaWiki/mediawiki-defines.txt

[MediaWiki-CVS] SVN: [115060] trunk/tools/planet/zh/config.ini

[MediaWiki-CVS] SVN: [115061] trunk/tools/planet/zh/config.ini

[MediaWiki-CVS] SVN: [115062] trunk/extensions/SolrStore/templates/SolrSearchTemplate_FIS. php

[MediaWiki-CVS] SVN: [115063] trunk/wikistats/squids/SquidReportArchive.pl

[MediaWiki-CVS] SVN: [115064] trunk/extensions

[MediaWiki-CVS] SVN: [115065] trunk/tools/mwmultiversion/multiversion/switchAllMediaWikis

[MediaWiki-CVS] SVN: [115066] trunk/wikistats/squids/SquidCountArchive.pl

[MediaWiki-CVS] SVN: [115067] trunk/debs/nginx

[MediaWiki-CVS] SVN: [115068] trunk/debs/nginx/debian

[MediaWiki-CVS] SVN: [115069] trunk/extensions/OpenID

[MediaWiki-CVS] SVN: [115070] trunk/php/luasandbox

12 matches

Site Navigation

Mail list logo

Footer information