Skip to content

Commit 6b1d9ad

Browse files
authored
Merge pull request #10 from aguvillalba/trunk
Fixes incompatibility with new version of pear/http_request2 2.4.0
2 parents cbe5a03 + ac5a58a commit 6b1d9ad

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

XML/RPC2/Util/HTTPRequest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@
4242
// dependencies {{{
4343
require_once 'XML/RPC2/Exception.php';
4444
require_once 'XML/RPC2/Client.php';
45-
require_once 'HTTP/Request2.php';
45+
if (!class_exists('HTTP_Request2', true)) {
46+
require_once 'HTTP/Request2.php';
47+
}
4648
// }}}
4749

4850
/**

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"require": {
2929
"php": ">=5.2.0",
3030
"pear/pear_exception": "^1.0.0",
31-
"pear/http_request2": "^2.3.0"
31+
"pear/http_request2": "^2.4.0"
3232
},
3333
"require-dev": {
3434
"phpunit/phpunit": "*"

0 commit comments

Comments
 (0)