aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-01-30 18:25:41 -0800
committerFriendika <info@friendika.com>2011-01-30 18:25:41 -0800
commita598f17e6d95d8a82df2994d61bfab74271dfe58 (patch)
treeb9bd722183863bac952c870fe4bc554da55bb1bc
parente8d52d879baf6a35de335cb2ef6a2fb0a5eb8b3e (diff)
downloadvolse-hubzilla-a598f17e6d95d8a82df2994d61bfab74271dfe58.tar.gz
volse-hubzilla-a598f17e6d95d8a82df2994d61bfab74271dfe58.tar.bz2
volse-hubzilla-a598f17e6d95d8a82df2994d61bfab74271dfe58.zip
wrong ref in ssl policy
-rw-r--r--boot.php4
-rw-r--r--include/notifier.php2
-rw-r--r--include/poller.php2
-rw-r--r--index.php2
4 files changed, 5 insertions, 5 deletions
diff --git a/boot.php b/boot.php
index bb7819fde..6b4fa080e 100644
--- 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 dd5d55ed0..59e29d7d1 100644
--- 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 1003b2f08..0dbc6f583 100644
--- 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 ae6a578cb..685a76a13 100644
--- 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']);
}