Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 22 Feb 2017 12:51:50 +0000 (13:51 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 22 Feb 2017 12:51:50 +0000 (13:51 +0100)
Change-Id: I7cac68e2d1b963eb2020b2cf479c82e69bd237d4

1  2 
tests/tine20/Tinebase/Server/Plugin/JsonTests.php
tine20/Tinebase/js/tineInit.js

@@@ -39,11 -40,12 +39,11 @@@ class Tinebase_Server_Plugin_JsonTests 
       */
      public function testServerCORSHeader()
      {
 -        $request = \Zend\Http\PhpEnvironment\Request::fromString(<<<EOS
 -OPTIONS /index.php HTTP/1.1\r
 -Host: localhost\r
 -ACCESS-CONTROL-REQUEST-METHOD: application/json\r
 -User-Agent: Mozilla/5.0 (X11; Linux i686; rv:15.0) Gecko/20120824 Thunderbird/15.0 Lightning/1.7\r
 -EOS
 +        $request = \Zend\Http\PhpEnvironment\Request::fromString(
-             "POST /index.php HTTP/1.1\r\n".
++            "OPTIONS /index.php HTTP/1.1\r\n".
 +            "Host: localhost\r\n".
 +            "ACCESS-CONTROL-REQUEST-METHOD: application/json\r\n".
 +            "User-Agent: Mozilla/5.0 (X11; Linux i686; rv:15.0) Gecko/20120824 Thunderbird/15.0 Lightning/1.7"
          );
          
          $server = Tinebase_Core::getDispatchServer($request);
Simple merge