| Index: branches/wmf/1.18wmf1/includes/db/DatabaseMysql.php |
| — | — | @@ -110,6 +110,7 @@ |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | if ( $success ) { |
| | 114 | + /* |
| 114 | 115 | $version = $this->getServerVersion(); |
| 115 | 116 | if ( version_compare( $version, '4.1' ) >= 0 ) { |
| 116 | 117 | // Tell the server we're communicating with it in UTF-8. |
| — | — | @@ -127,6 +128,7 @@ |
| 128 | 129 | $this->query( "SET sql_mode = $mode", __METHOD__ ); |
| 129 | 130 | } |
| 130 | 131 | } |
| | 132 | + */ |
| 131 | 133 | |
| 132 | 134 | // Turn off strict mode if it is on |
| 133 | 135 | } else { |
| Index: branches/wmf/1.18wmf1/includes/cache/HTMLCacheUpdate.php |
| — | — | @@ -182,6 +182,10 @@ |
| 183 | 183 | array( 'page_id IN (' . $dbw->makeList( $batch ) . ')' ), |
| 184 | 184 | __METHOD__ |
| 185 | 185 | ); |
| | 186 | + # WM patch: throttle to avoid apache CPU exhaustion -- TS |
| | 187 | + if ( php_sapi_name() == 'cli' ) { |
| | 188 | + sleep( 1 ); |
| | 189 | + } |
| 186 | 190 | } |
| 187 | 191 | |
| 188 | 192 | # Update squid |
| Index: branches/wmf/1.18wmf1/includes/cache/SquidUpdate.php |
| — | — | @@ -174,10 +174,24 @@ |
| 175 | 175 | } |
| 176 | 176 | $url = SquidUpdate::expand( $url ); |
| 177 | 177 | |
| | 178 | + // Try and incremement value in APC cache |
| | 179 | + $id = apc_inc( 'squidhtcppurge' ); |
| | 180 | + if ( $id === false ) { |
| | 181 | + // If false, means it didn't work |
| | 182 | + // Chances are that means it isn't in the cache |
| | 183 | + // Start saving a cached value |
| | 184 | + $add = apc_add( 'squidhtcppurge', 1 ); |
| | 185 | + if ( $add === false ) { |
| | 186 | + wfDebugLog( 'htcp', 'Unable to set value to APC cache' ); |
| | 187 | + $id = 0; |
| | 188 | + } else { |
| | 189 | + $id = $add; |
| | 190 | + } |
| | 191 | + } |
| 178 | 192 | // Construct a minimal HTCP request diagram |
| 179 | 193 | // as per RFC 2756 |
| 180 | 194 | // Opcode 'CLR', no response desired, no auth |
| 181 | | - $htcpTransID = rand(); |
| | 195 | + $htcpTransID = $id; |
| 182 | 196 | |
| 183 | 197 | $htcpSpecifier = pack( 'na4na*na8n', |
| 184 | 198 | 4, 'HEAD', strlen( $url ), $url, |
| Index: branches/wmf/1.18wmf1/includes/DefaultSettings.php |
| — | — | @@ -158,7 +158,8 @@ |
| 159 | 159 | * The URL path of the skins directory. Defaults to "{$wgScriptPath}/skins" |
| 160 | 160 | */ |
| 161 | 161 | $wgStylePath = false; |
| 162 | | -$wgStyleSheetPath = &$wgStylePath; |
| | 162 | +# Broken PHP, canary mismatch -- TS |
| | 163 | +#$wgStyleSheetPath = &$wgStylePath; |
| 163 | 164 | |
| 164 | 165 | /** |
| 165 | 166 | * The URL path of the skins directory. Should not point to an external domain. |
| — | — | @@ -3563,10 +3564,11 @@ |
| 3564 | 3565 | * user who has provided an e-mail address. |
| 3565 | 3566 | */ |
| 3566 | 3567 | $wgAutopromote = array( |
| | 3568 | + /* test patch -- TS |
| 3567 | 3569 | 'autoconfirmed' => array( '&', |
| 3568 | 3570 | array( APCOND_EDITCOUNT, &$wgAutoConfirmCount ), |
| 3569 | 3571 | array( APCOND_AGE, &$wgAutoConfirmAge ), |
| 3570 | | - ), |
| | 3572 | + ),*/ |
| 3571 | 3573 | ); |
| 3572 | 3574 | |
| 3573 | 3575 | /** |