- temoved compat stuff and checks from trunk after having created the php4 branch;

[plcapi.git] / lib / xmlrpc.inc

diff --git a/lib/xmlrpc.inc b/lib/xmlrpc.inc
index 6bad30a..f57051a 100644 (file)
--- a/lib/xmlrpc.inc
+++ b/lib/xmlrpc.inc
@@ -45,29 +45,6 @@
                }\r
        }\r
 \r
-       // Try to be backward compat with php < 4.2 (are we not being nice ?)\r
-       $phpversion = phpversion();\r
-       if($phpversion[0] == '4' && $phpversion[2] < 2)\r
-       {\r
-               // give an opportunity to user to specify where to include other files from\r
-               if(!defined('PHP_XMLRPC_COMPAT_DIR'))\r
-               {\r
-                       define('PHP_XMLRPC_COMPAT_DIR',dirname(__FILE__).'/compat/');\r
-               }\r
-               if($phpversion[2] == '0')\r
-               {\r
-                       if($phpversion[4] < 6)\r
-                       {\r
-                               include(PHP_XMLRPC_COMPAT_DIR.'is_callable.php');\r
-                       }\r
-                       include(PHP_XMLRPC_COMPAT_DIR.'is_scalar.php');\r
-                       include(PHP_XMLRPC_COMPAT_DIR.'array_key_exists.php');\r
-                       include(PHP_XMLRPC_COMPAT_DIR.'version_compare.php');\r
-               }\r
-               include(PHP_XMLRPC_COMPAT_DIR.'var_export.php');\r
-               include(PHP_XMLRPC_COMPAT_DIR.'is_a.php');\r
-       }\r
-\r
        // G. Giunta 2005/01/29: declare global these variables,\r
        // so that xmlrpc.inc will work even if included from within a function\r
        // Milosch: 2005/08/07 - explicitly request these via $GLOBALS where used.\r
@@ -231,7 +208,7 @@
        $GLOBALS['xmlrpc_internalencoding']='ISO-8859-1';\r
 \r
        $GLOBALS['xmlrpcName']='XML-RPC for PHP';\r
-       $GLOBALS['xmlrpcVersion']='2.2.2';\r
+       $GLOBALS['xmlrpcVersion']='3.0.0.beta';\r
 \r
        // let user errors start at 800\r
        $GLOBALS['xmlrpcerruser']=800;\r
@@ -943,11 +920,7 @@
                        }\r
 \r
                        // keepalives: enabled by default ONLY for PHP >= 4.3.8\r
-                       // (see http://curl.haxx.se/docs/faq.html#7.3)\r
-                       if(version_compare(phpversion(), '4.3.8') >= 0)\r
-                       {\r
-                               $this->keepalive = true;\r
-                       }\r
+                       $this->keepalive = true;\r
 \r
                        // by default the xml parser can support these 3 charset encodings\r
                        $this->accepted_charset_encodings = array('UTF-8', 'ISO-8859-1', 'US-ASCII');\r