From bacd49a6a8fd3554056173829987dd608b4d72b6 Mon Sep 17 00:00:00 2001
From: Mikael Nordfeldth <mmn@hethane.se>
Date: Thu, 14 Jan 2016 13:06:37 +0100
Subject: [PATCH] Don't try to replace http with https if https already exists

---
 plugins/OStatus/classes/HubSub.php         | 9 ++++++---
 plugins/OStatus/lib/huboutqueuehandler.php | 5 +++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/plugins/OStatus/classes/HubSub.php b/plugins/OStatus/classes/HubSub.php
index 6499e1b4cf..732ef33743 100644
--- a/plugins/OStatus/classes/HubSub.php
+++ b/plugins/OStatus/classes/HubSub.php
@@ -306,10 +306,13 @@ class HubSub extends Managed_DataObject
         if ('http' === parse_url($this->callback, PHP_URL_SCHEME)) {
             // Test if the feed callback for this node has migrated to HTTPS
             $httpscallback = preg_replace('/^http/', 'https', $this->callback, 1);
-            if ($httpscallback === $this->callback) {
-                throw new ServerException('Trying to preg_replace http to https on '._ve($this->callback).' failed and resulted in an identical string: '._ve($httpscallback).'.');
+            $alreadyreplaced = self::getByHashKey(self::hashkey($this->getTopic(), $httpscallback));
+            if ($alreadyreplaced instanceof HubSub) {
+                $this->delete();
+                throw new AlreadyFulfilledException('The remote side has already established an HTTPS callback, deleting the legacy HTTP entry.');
             }
-            common_debug('PuSH callback to '._ve($this->callback).' for '._ve($this->getTopic()).' testing with HTTPS callback: '._ve($httpscallback));
+
+            common_debug('PuSH callback to '._ve($this->callback).' for '._ve($this->getTopic()).' trying HTTPS callback: '._ve($httpscallback));
             $response = $request->post($httpscallback, $headers);
             if ($response->isOk()) {
                 $orig = clone($this);
diff --git a/plugins/OStatus/lib/huboutqueuehandler.php b/plugins/OStatus/lib/huboutqueuehandler.php
index 9cab847cc2..590f2e3b25 100644
--- a/plugins/OStatus/lib/huboutqueuehandler.php
+++ b/plugins/OStatus/lib/huboutqueuehandler.php
@@ -44,10 +44,11 @@ class HubOutQueueHandler extends QueueHandler
 
         try {
             $sub->push($atom);
+        } catch (AlreadyFulfilledException $e) {
+            common_log(LOG_INFO, "Failed PuSH to $sub->callback for $sub->topic (".get_class($e)."): " . $e->getMessage());
         } catch (Exception $e) {
             $retries--;
-            $msg = "Failed PuSH to $sub->callback for $sub->topic: " .
-                   $e->getMessage();
+            $msg = "Failed PuSH to $sub->callback for $sub->topic (".get_class($e)."): " . $e->getMessage();
             if ($retries > 0) {
                 common_log(LOG_INFO, "$msg; scheduling for $retries more tries");