Added profile calls to various functions in
MWHttpRequest as well as to the wrapper
function Http::request.
Change-Id: I7f2819a075891dbc565a7524d56e7bf077ab089a
*/
public static function request( $method, $url, $options = array() ) {
wfDebug( "HTTP: $method: $url\n" );
*/
public static function request( $method, $url, $options = array() ) {
wfDebug( "HTTP: $method: $url\n" );
+ wfProfileIn( __METHOD__ . "-$method" );
+
$options['method'] = strtoupper( $method );
if ( !isset( $options['timeout'] ) ) {
$options['method'] = strtoupper( $method );
if ( !isset( $options['timeout'] ) ) {
$status = $req->execute();
if ( $status->isOK() ) {
$status = $req->execute();
if ( $status->isOK() ) {
- return $req->getContent();
+ $content = $req->getContent();
+ wfProfileOut( __METHOD__ . "-$method" );
+ return $content;
+ wfProfileOut( __METHOD__ . "-$method" );
public function execute() {
global $wgTitle;
public function execute() {
global $wgTitle;
+ wfProfileIn( __METHOD__ );
+
$this->content = "";
if ( strtoupper( $this->method ) == "HEAD" ) {
$this->content = "";
if ( strtoupper( $this->method ) == "HEAD" ) {
if ( !isset( $this->reqHeaders['User-Agent'] ) ) {
$this->setUserAgent( Http::userAgent() );
}
if ( !isset( $this->reqHeaders['User-Agent'] ) ) {
$this->setUserAgent( Http::userAgent() );
}
+
+ wfProfileOut( __METHOD__ );
* found in an array in the member variable headerList.
*/
protected function parseHeader() {
* found in an array in the member variable headerList.
*/
protected function parseHeader() {
+ wfProfileIn( __METHOD__ );
+
$lastname = "";
foreach ( $this->headerList as $header ) {
$lastname = "";
foreach ( $this->headerList as $header ) {
+
+ wfProfileOut( __METHOD__ );
* Parse the cookies in the response headers and store them in the cookie jar.
*/
protected function parseCookies() {
* Parse the cookies in the response headers and store them in the cookie jar.
*/
protected function parseCookies() {
+ wfProfileIn( __METHOD__ );
+
if ( !$this->cookieJar ) {
$this->cookieJar = new CookieJar;
}
if ( !$this->cookieJar ) {
$this->cookieJar = new CookieJar;
}
$this->cookieJar->parseCookieResponseHeader( $cookie, $url['host'] );
}
}
$this->cookieJar->parseCookieResponseHeader( $cookie, $url['host'] );
}
}
+
+ wfProfileIn( __METHOD__ );
}
public function execute() {
}
public function execute() {
+ wfProfileIn( __METHOD__ );
+
parent::execute();
if ( !$this->status->isOK() ) {
parent::execute();
if ( !$this->status->isOK() ) {
+ wfProfileOut( __METHOD__ );
$curlHandle = curl_init( $this->url );
if ( !curl_setopt_array( $curlHandle, $this->curlOptions ) ) {
$curlHandle = curl_init( $this->url );
if ( !curl_setopt_array( $curlHandle, $this->curlOptions ) ) {
+ wfProfileOut( __METHOD__ );
throw new MWException( "Error setting curl options." );
}
throw new MWException( "Error setting curl options." );
}
$this->parseHeader();
$this->setStatus();
$this->parseHeader();
$this->setStatus();
+ wfProfileOut( __METHOD__ );
+
}
public function execute() {
}
public function execute() {
+ wfProfileIn( __METHOD__ );
+
parent::execute();
if ( is_array( $this->postData ) ) {
parent::execute();
if ( is_array( $this->postData ) ) {
if ( $fh === false ) {
$this->status->fatal( 'http-request-error' );
if ( $fh === false ) {
$this->status->fatal( 'http-request-error' );
+ wfProfileOut( __METHOD__ );
return $this->status;
}
if ( $result['timed_out'] ) {
$this->status->fatal( 'http-timed-out', $this->url );
return $this->status;
}
if ( $result['timed_out'] ) {
$this->status->fatal( 'http-timed-out', $this->url );
+ wfProfileOut( __METHOD__ );
+ wfProfileOut( __METHOD__ );
+
return $this->status;
}
}
return $this->status;
}
}