unix socket support

[jasondcamp]

Index: cls/install.cls.php

--- wtorrent.orginal/cls/install.cls.php 2008-12-03 18:03:34.000000000 +0100 +++ wtorrent/cls/install.cls.php 2008-12-03 18:24:49.000000000 +0100 @@ -231,7 +231,7 @@ class install extends Web } private function tryClient($rt_dir, $rt_host, $rt_port, $rt_auth, $rt_user, $rt_passwd) {

• $this->client = new xmlrpc_client($rt_dir, $rt_host, $rt_port);

•          $this->client = new xmlrpc_unix_client($rt_dir, $rt_host, $rt_port);
  
         if($rt_auth)
                 $this->client->setCredentials($rt_user, $rt_passwd);

[jasondcamp]

diff -rpNu -x .svn wtorrent.orginal/cls/rtorrent.cls.php wtorrent/cls/rtorrent.cls.php

Index: cls/rtorrent.cls.php

--- wtorrent.orginal/cls/rtorrent.cls.php 2008-12-03 18:03:34.000000000 +0100 +++ wtorrent/cls/rtorrent.cls.php 2008-12-03 18:24:47.000000000 +0100 @@ -134,7 +134,7 @@ class rtorrent extends Web } public function setClient() {

• $this->client = new xmlrpc_client(RT_DIR, RT_HOST, RT_PORT);

•          $this->client = new xmlrpc_unix_client(RT_DIR, RT_HOST, RT_PORT);
         $this->multicall = new multicall($this->client, $this->data);
  
         if(RT_AUTH)

[jasondcamp]

diff -rpNu -x .svn wtorrent.orginal/lib/inc/includes.inc.php wtorrent/lib/inc/includes.inc.php

Index: lib/inc/includes.inc.php

--- wtorrent.orginal/lib/inc/includes.inc.php 2008-12-03 18:03:36.000000000 +0100 +++ wtorrent/lib/inc/includes.inc.php 2008-12-03 18:21:56.000000000 +0100 @@ -25,6 +25,7 @@ require_once( 'cls/torrent.cls.php' ); require_once( 'cls/multicall.cls.php' ); //require_once( 'cls/install.cls.php' ); require_once( 'lib/xmlrpc/xmlrpc.inc.php' ); +require_once( 'lib/xmlrpc/xmlrpc_unix.inc.php'); require_once( 'lib/inc/utils.inc.php' ); require_once( 'lib/inc/string.inc.php' ); require_once( 'lib/bdecode/class.bdecode.php' );

[jasondcamp]

diff -rpNu -x .svn wtorrent.orginal/lib/xmlrpc/xmlrpc_unix.inc.php wtorrent/lib/xmlrpc/xmlrpc_unix.inc.php

Index: lib/xmlrpc/xmlrpc_unix.inc.php

--- wtorrent.orginal/lib/xmlrpc/xmlrpc_unix.inc.php 1970-01-01 01:00:00.000000000 +0100 +++ wtorrent/lib/xmlrpc/xmlrpc_unix.inc.php 2008-12-03 18:49:45.000000000 +0100 @@ -0,0 +1,80 @@ +<?php

• +class xmlrpc_unix_client extends xmlrpc_client { + +

• function& send($msg, $timeout=0, $method='') {
• if(empty($method))
• $method=$this->method;
• if($method!='file' AND $method!='unix' AND $method!='socket')
• parent::send($msg, $timeout=0, $method='');
• else {
• $r =& $this->sendPayloadUNIX( $msg, $this->path);
• }
• return $r;
• }
• function &sendPayloadUNIX($msg, $path) {
• if(empty($msg->payload)) {
• $msg->createPayload($this->request_charset_encoding);
• }
• $payload = $msg->payload;
• $encoding_hdr = '';
• $uri = $this->path;
• $op= "POST / HTTP/1.0\r\n" .
• 'User-Agent: ' . $GLOBALS['xmlrpcName'] . ' ' . $GLOBALS['xmlrpcVersion'] . "\r\n" .
• 'Host: localhost '. "\r\n" .
• 'Content-Type: ' . $msg->content_type . "\r\nContent-Length: " .
• strlen($payload) . "\r\n\r\n" .
• $payload;
• $len = strlen( $payload );
• $headers = "CONTENT_LENGTH\0{$len}\0";
• $headers .= "SCGI\01\0";
• $len = strlen( $headers );
• $op = "$len:$headers,$payload";
• //$op= $payload;
• if($this->debug > 1) {
• print "

  \n---SENDING---\n" . $op . "\n---END---\n

  ";
• // let the client see this now in case http times out...
• flush();
• }
• $socket = socket_create(AF_UNIX, SOCK_STREAM, 0);
• $result = socket_connect($socket, $uri);
• if(!$result) {
• $this->errstr='Connect error: '.$this->errstr;
• $r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $this->errstr . ' (' . $this->errno . ')');
• return $r;
• }
• $result = socket_write ($socket, $op, strlen ($op));
• if(!$result) {
• $this->errstr='Write error';
• $r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $this->errstr);
• return $r;
• }
• $ipd='';
• while($data=socket_read($socket,32768)) {
• // shall we check for $data === FALSE?
• // as per the manual, it signals an error
• $ipd.=$data;
• }
• socket_close($socket);
• $ipd = preg_replace('/\r/', '', $ipd);
• //print $pid;
• $lines = explode("\n", $ipd);
• $ipd='';
• foreach ($lines as $value ) {
• if(preg_match('/(^<|.*<)/', $value))
• $ipd .= $value."\n";
• }
• $r =& $msg->parseResponse($ipd, false, $this->return_type);
• return $r; +
• } + +}