svn commit: r1062184 - /incubator/chemistry/phpclient/trunk/cmis_repository_wrapper.php

[richardm]

Author: richardm
Date: Sat Jan 22 16:02:07 2011
New Revision: 1062184

URL: http://svn.apache.org/viewvc?rev=1062184&view=rev
Log:
CMIS-289        need to be able to set additional cURL options
Patch Provided by       Stefan Topfstedt

Modified:
    incubator/chemistry/phpclient/trunk/cmis_repository_wrapper.php

Modified: incubator/chemistry/phpclient/trunk/cmis_repository_wrapper.php
URL: 
http://svn.apache.org/viewvc/incubator/chemistry/phpclient/trunk/cmis_repository_wrapper.php?rev=1062184&r1=1062183&r2=1062184&view=diff
==============================================================================
--- incubator/chemistry/phpclient/trunk/cmis_repository_wrapper.php (original)
+++ incubator/chemistry/phpclient/trunk/cmis_repository_wrapper.php Sat Jan 22 
16:02:07 2011
@@ -65,6 +65,8 @@ class CMISRepositoryWrapper
     var $workspace;
     var $last_request;
     var $do_not_urlencode;
+    protected $_addlCurlOptions = array();
+    
     static $namespaces = array (
         "cmis" => "http://docs.oasis-open.org/ns/cmis/core/200908/";,
         "cmisra" => "http://docs.oasis-open.org/ns/cmis/restatom/200908/";,
@@ -73,11 +75,13 @@ class CMISRepositoryWrapper
         
     );
 
-    function __construct($url, $username = null, $password = null, $options = 
null)
+    function __construct($url, $username = null, $password = null, $options = 
null, array $addlCurlOptions = array())
     {
         if (is_array($options) && $options["config:do_not_urlencode"]) {
             $this->do_not_urlencode=true;
         }
+        $this->_addlCurlOptions = $addlCurlOptions; // additional cURL options
+        
         $this->connect($url, $username, $password, $options);
     }
 
@@ -198,6 +202,16 @@ class CMISRepositoryWrapper
         {
             curl_setopt($session, CURLOPT_POST, true);
         }
+        
+        // apply addl. cURL options
+        // WARNING: this may override previously set options
+        if (count($this->_addlCurlOptions)) {
+            foreach ($this->_addlCurlOptions as $key => $value) {
+                curl_setopt($session, $key, $value);
+            }
+        }
+        
+        
         //TODO: Make this storage optional
         $retval = new stdClass();
         $retval->url = $url;
@@ -628,9 +642,9 @@ class CMISService extends CMISRepository
     var $_title_cache;
     var $_objTypeId_cache;
     var $_type_cache;
-    function __construct($url, $username, $password, $options = null)
+    function __construct($url, $username, $password, $options = null, array 
$addlCurlOptions = array())
     {
-        parent :: __construct($url, $username, $password, $options);
+        parent :: __construct($url, $username, $password, $options, 
$addlCurlOptions);
         $this->_link_cache = array ();
         $this->_title_cache = array ();
         $this->_objTypeId_cache = array ();