X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=demo%2Fserver%2Fproxy.php;h=a0a0f1d9c59081a9a65172426fbe27153d7cc922;hb=acc91a7e16e2e2f09fb5b192e89ac4007a40973f;hp=adf80041bd9f1ccdcde57f4311280fd3d9282095;hpb=70b5a85b3f6831d37e34a7b86bf87383247f16bb;p=plcapi.git

diff --git a/demo/server/proxy.php b/demo/server/proxy.php
index adf8004..a0a0f1d 100644
--- a/demo/server/proxy.php
+++ b/demo/server/proxy.php
@@ -3,14 +3,14 @@
  * XMLRPC server acting as proxy for requests to other servers
  * (useful e.g. for ajax-originated calls that can only connect back to
  * the originating server).
+ * For an example of a transparent reverse-proxy, see the ReverseProxy class in package phpxmlrpc/extras
  *
  * @author Gaetano Giunta
- * @copyright (C) 2006-2015 G. Giunta
+ * @copyright (C) 2006-2021 G. Giunta
  * @license code licensed under the BSD License: see file license.txt
  */
 
-include_once __DIR__ . "/../../src/Autoloader.php";
-PhpXmlRpc\Autoloader::register();
+require_once __DIR__ . "/_prepend.php";
 
 /**
  * Forward an xmlrpc request to another server, and return to client the response received.
@@ -58,13 +58,13 @@ function forward_request($req)
 
     // build call for remote server
     /// @todo find a way to forward client info (such as IP) to server, either
-    /// - as xml comments in the payload, or
-    /// - using std http header conventions, such as X-forwarded-for...
-    $reqMethod = $encoder->decode($req->getParam(1));
+    ///       - as xml comments in the payload, or
+    ///       - using std http header conventions, such as X-forwarded-for...
+    $reqMethod = $req->getParam(1)->scalarval();
     $pars = $req->getParam(2);
     $req = new PhpXmlRpc\Request($reqMethod);
-    for ($i = 0; $i < $pars->arraySize(); $i++) {
-        $req->addParam($pars->arraymem($i));
+    foreach ($pars as $par) {
+        $req->addParam($par);
     }
 
     // add debug info into response we give back to caller
@@ -74,15 +74,19 @@ function forward_request($req)
 }
 
 // run the server
+// NB: take care not to output anything else after this call, as it will mess up the responses and it will be hard to
+// debug. In case you have to do so, at least re-emit a correct Content-Length http header (requires output buffering)
 $server = new PhpXmlRpc\Server(
     array(
         'xmlrpcproxy.call' => array(
             'function' => 'forward_request',
             'signature' => array(
                 array('mixed', 'string', 'string', 'array'),
-                array('mixed', 'string', 'string', 'array', 'stuct'),
+                array('mixed', 'string', 'string', 'array', 'struct'),
             ),
             'docstring' => 'forwards xmlrpc calls to remote servers. Returns remote method\'s response. Accepts params: remote server url (might include basic auth credentials), method name, array of params, and (optionally) a struct containing call options',
         ),
     )
 );
+
+require_once __DIR__ . "/_append.php";