--- a/web/lib/Zend/Soap/AutoDiscover.php Thu Mar 21 17:31:31 2013 +0100
+++ b/web/lib/Zend/Soap/AutoDiscover.php Thu Mar 21 19:50:53 2013 +0100
@@ -15,9 +15,9 @@
* @category Zend
* @package Zend_Soap
* @subpackage AutoDiscover
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @version $Id: AutoDiscover.php 23338 2010-11-15 14:59:33Z alexander $
+ * @version $Id: AutoDiscover.php 24842 2012-05-31 18:31:28Z rob $
*/
/**
@@ -268,7 +268,9 @@
*/
protected function getRequestUriWithoutParameters()
{
- if (isset($_SERVER['HTTP_X_REWRITE_URL'])) { // check this first so IIS will catch
+ if (isset($_SERVER['HTTP_X_ORIGINAL_URL'])) { // IIS with Microsoft Rewrite Module
+ $requestUri = $_SERVER['HTTP_X_ORIGINAL_URL'];
+ } elseif (isset($_SERVER['HTTP_X_REWRITE_URL'])) { // check this first so IIS will catch
$requestUri = $_SERVER['HTTP_X_REWRITE_URL'];
} elseif (isset($_SERVER['REQUEST_URI'])) {
$requestUri = $_SERVER['REQUEST_URI'];
@@ -378,10 +380,10 @@
/**
* Add a function to the WSDL document.
*
- * @param $function Zend_Server_Reflection_Function_Abstract function to add
- * @param $wsdl Zend_Soap_Wsdl WSDL document
- * @param $port object wsdl:portType
- * @param $binding object wsdl:binding
+ * @param Zend_Server_Reflection_Function_Abstract $function function to add
+ * @param Zend_Soap_Wsdl $wsdl WSDL document
+ * @param object $port wsdl:portType
+ * @param object $binding wsdl:binding
* @return void
*/
protected function _addFunctionToWsdl($function, $wsdl, $port, $binding)