equal
deleted
inserted
replaced
13 * to license@zend.com so we can send you a copy immediately. |
13 * to license@zend.com so we can send you a copy immediately. |
14 * |
14 * |
15 * @category Zend |
15 * @category Zend |
16 * @package Zend_Soap |
16 * @package Zend_Soap |
17 * @subpackage AutoDiscover |
17 * @subpackage AutoDiscover |
18 * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) |
18 * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) |
19 * @license http://framework.zend.com/license/new-bsd New BSD License |
19 * @license http://framework.zend.com/license/new-bsd New BSD License |
20 * @version $Id: AutoDiscover.php 23338 2010-11-15 14:59:33Z alexander $ |
20 * @version $Id: AutoDiscover.php 24842 2012-05-31 18:31:28Z rob $ |
21 */ |
21 */ |
22 |
22 |
23 /** |
23 /** |
24 * @see Zend_Server_Interface |
24 * @see Zend_Server_Interface |
25 */ |
25 */ |
266 * |
266 * |
267 * @return string |
267 * @return string |
268 */ |
268 */ |
269 protected function getRequestUriWithoutParameters() |
269 protected function getRequestUriWithoutParameters() |
270 { |
270 { |
271 if (isset($_SERVER['HTTP_X_REWRITE_URL'])) { // check this first so IIS will catch |
271 if (isset($_SERVER['HTTP_X_ORIGINAL_URL'])) { // IIS with Microsoft Rewrite Module |
|
272 $requestUri = $_SERVER['HTTP_X_ORIGINAL_URL']; |
|
273 } elseif (isset($_SERVER['HTTP_X_REWRITE_URL'])) { // check this first so IIS will catch |
272 $requestUri = $_SERVER['HTTP_X_REWRITE_URL']; |
274 $requestUri = $_SERVER['HTTP_X_REWRITE_URL']; |
273 } elseif (isset($_SERVER['REQUEST_URI'])) { |
275 } elseif (isset($_SERVER['REQUEST_URI'])) { |
274 $requestUri = $_SERVER['REQUEST_URI']; |
276 $requestUri = $_SERVER['REQUEST_URI']; |
275 } elseif (isset($_SERVER['ORIG_PATH_INFO'])) { // IIS 5.0, PHP as CGI |
277 } elseif (isset($_SERVER['ORIG_PATH_INFO'])) { // IIS 5.0, PHP as CGI |
276 $requestUri = $_SERVER['ORIG_PATH_INFO']; |
278 $requestUri = $_SERVER['ORIG_PATH_INFO']; |
376 } |
378 } |
377 |
379 |
378 /** |
380 /** |
379 * Add a function to the WSDL document. |
381 * Add a function to the WSDL document. |
380 * |
382 * |
381 * @param $function Zend_Server_Reflection_Function_Abstract function to add |
383 * @param Zend_Server_Reflection_Function_Abstract $function function to add |
382 * @param $wsdl Zend_Soap_Wsdl WSDL document |
384 * @param Zend_Soap_Wsdl $wsdl WSDL document |
383 * @param $port object wsdl:portType |
385 * @param object $port wsdl:portType |
384 * @param $binding object wsdl:binding |
386 * @param object $binding wsdl:binding |
385 * @return void |
387 * @return void |
386 */ |
388 */ |
387 protected function _addFunctionToWsdl($function, $wsdl, $port, $binding) |
389 protected function _addFunctionToWsdl($function, $wsdl, $port, $binding) |
388 { |
390 { |
389 $uri = $this->getUri(); |
391 $uri = $this->getUri(); |