wrong ref in ssl policy

diff --git a/boot.php b/boot.php
index bb7819fdec38149e9bd5794b0ef33500c6e9f9e1..6b4fa080e0da0cd4c98545e67d1c8f592ef7469d 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -283,9 +283,9 @@ class App {
 
                $scheme = $this->scheme;
 
-               if(($ssl) || ($a->config['ssl_policy'] == SSL_POLICY_FULL)) 
+               if(($ssl) || ($this->config['ssl_policy'] == SSL_POLICY_FULL)) 
                        $scheme = 'https';
-               if(($a->config['ssl_policy'] == SSL_POLICY_SELFSIGN) && (local_user() || x($_POST,'auth-params')))
+               if(($this->config['ssl_policy'] == SSL_POLICY_SELFSIGN) && (local_user() || x($_POST,'auth-params')))
                        $scheme = 'https';
 
                $this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );

diff --git a/include/notifier.php b/include/notifier.php
index dd5d55ed0009414301e2931d03c250174421862c..59e29d7d1f968e81fa182faaaa99ed21fa74c5a6 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -363,7 +363,7 @@ function notifier_run($argv, $argc){
                                        continue;
                                $params = 'hub.mode=publish&hub.url=' . urlencode($a->get_baseurl() . '/dfrn_poll/' . $owner['nickname'] );
                                post_url($h,$params);
-                               logger('pubsub: publish: ' . $h . ' returned ' . $a->get_curl_code());
+                               logger('pubsub: publish: ' . $h . ' ' . $params . ' returned ' . $a->get_curl_code());
                                if(count($hubs) > 1)
                                        sleep(7);                               // try and avoid multiple hubs responding at precisely the same time
                        }

diff --git a/include/poller.php b/include/poller.php
index 1003b2f0816e144a9b4368386d55aadd888826f6..0dbc6f5831459d07700cf83d0d1db86a1f526519 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -76,7 +76,7 @@ function poller_run($argv, $argc){
                                $contact['priority'] = (($interval !== false) ? intval($interval) : 3);
                                $hub_update = false;
 
-                               if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day"))
+                               if((datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day")) || $force)
                                                $hub_update = true;
                        }
 

diff --git a/index.php b/index.php
index ae6a578cb4a68bb9b1b6c02b6e6a675643ed4fb7..685a76a13185e26baf02960e43bf2e4a17896776 100644 (file)
--- a/index.php
+++ b/index.php
@@ -140,7 +140,7 @@ if(strlen($a->module)) {
        }
        else {
                if((x($_SERVER,'QUERY_STRING')) && ($_SERVER['QUERY_STRING'] === 'q=internal_error.html') && isset($dreamhost_error_hack)) {
-                       logger('index.php: dreamhost_error_hack invoked');
+                       logger('index.php: dreamhost_error_hack invoked. Original URI =' . $_SERVER['REQUEST_URI']);
                        goaway($a->get_baseurl() . $_SERVER['REQUEST_URI']);
                }