diff -r 5e7a0fedabdf -r 877f952ae2bd web/lib/Zend/Feed/Pubsubhubbub/CallbackAbstract.php --- a/web/lib/Zend/Feed/Pubsubhubbub/CallbackAbstract.php Thu Mar 21 17:31:31 2013 +0100 +++ b/web/lib/Zend/Feed/Pubsubhubbub/CallbackAbstract.php Thu Mar 21 19:50:53 2013 +0100 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Feed_Pubsubhubbub * @subpackage Callback - * @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: CallbackAbstract.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: CallbackAbstract.php 24842 2012-05-31 18:31:28Z rob $ */ /** @@ -34,14 +34,14 @@ * @category Zend * @package Zend_Feed_Pubsubhubbub * @subpackage Callback - * @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 */ abstract class Zend_Feed_Pubsubhubbub_CallbackAbstract implements Zend_Feed_Pubsubhubbub_CallbackInterface { /** - * An instance of Zend_Feed_Pubsubhubbub_Model_SubscriptionInterface used + * An instance of Zend_Feed_Pubsubhubbub_Model_SubscriptionInterface used * to background save any verification tokens associated with a subscription * or other. * @@ -219,7 +219,9 @@ protected function _detectCallbackUrl() { $callbackUrl = ''; - if (isset($_SERVER['HTTP_X_REWRITE_URL'])) { + if (isset($_SERVER['HTTP_X_ORIGINAL_URL'])) { + $callbackUrl = $_SERVER['HTTP_X_ORIGINAL_URL']; + } elseif (isset($_SERVER['HTTP_X_REWRITE_URL'])) { $callbackUrl = $_SERVER['HTTP_X_REWRITE_URL']; } elseif (isset($_SERVER['REQUEST_URI'])) { $callbackUrl = $_SERVER['REQUEST_URI'];