| Index: branches/wmf/1.17wmf1/includes/objectcache/EhcacheBagOStuff.php |
| — | — | @@ -23,7 +23,6 @@ |
| 24 | 24 | ? $params['connectTimeout'] : 1; |
| 25 | 25 | $this->timeout = isset( $params['timeout'] ) ? $params['timeout'] : 1; |
| 26 | 26 | $this->curlOptions = array( |
| 27 | | - CURLOPT_CONNECTTIMEOUT_MS => intval( $this->connectTimeout * 1000 ), |
| 28 | 27 | CURLOPT_RETURNTRANSFER => 1, |
| 29 | 28 | CURLOPT_CUSTOMREQUEST => 'GET', |
| 30 | 29 | CURLOPT_POST => 0, |
| — | — | @@ -32,8 +31,10 @@ |
| 33 | 32 | ); |
| 34 | 33 | if ( defined( 'CURLOPT_TIMEOUT_MS' ) ) { |
| 35 | 34 | $this->curlOptions[CURLOPT_TIMEOUT_MS] = intval( $this->timeout * 1000 ); |
| | 35 | + $this->curlOptions[CURLOPT_CONNECTTIMEOUT_MS] = intval( $this->connectTimeout * 1000 ); |
| 36 | 36 | } else { |
| 37 | 37 | $this->curlOptions[CURLOPT_TIMEOUT] = ceil( $this->timeout ); |
| | 38 | + $this->curlOptions[CURLOPT_CONNECTTIMEOUT] = ceil( $this->connectTimeout ); |
| 38 | 39 | } |
| 39 | 40 | } |
| 40 | 41 | |