Merge remote-tracking branch 'upstream/master' into social-master

Signed-off-by: Roland Haeder <roland@mxchange.org>

diff --cc actions/rsd.php
Simple merge

diff --cc classes/File_redirection.php
Simple merge

diff --cc classes/Notice.php
Simple merge

diff --cc classes/User_group.php
Simple merge

diff --cc lib/action.php
Simple merge

diff --cc lib/default.php
Simple merge

diff --cc lib/httpclient.php
Simple merge

diff --cc lib/installer.php
Simple merge

diff --cc lib/noticelistitem.php
Simple merge

diff --cc lib/util.php
Simple merge

diff --cc plugins/Autocomplete/actions/autocomplete.php
Simple merge

diff --cc plugins/Event/EventPlugin.php
Simple merge

diff --cc plugins/Linkback/LinkbackPlugin.php
index 55615273d38ba5ccc57eb8bbce4d1525a49d678c,941e7c4c4b9241705c02dbddefb3e35586973bfe..3a7de0d04558336f4166bc99211918d403e362a0
--- 1/plugins/Linkback/LinkbackPlugin.php
--- 2/plugins/Linkback/LinkbackPlugin.php
+++ b/plugins/Linkback/LinkbackPlugin.php
@@@ -139,14 -140,17 +140,17 @@@ class LinkbackPlugin extends Plugi
  
      // Based on https://github.com/indieweb/mention-client-php
      // which is licensed Apache 2.0
 -    function getWebmention($result) {
 +    function getWebmention(Auth_Yadis_HTTPFetcher $result) {
-         // XXX: the fetcher only gives back one of each header, so this may fail on multiple Link headers
-         if(preg_match('~<((?:https?://)?[^>]+)>; rel="webmention"~', $result->headers['Link'], $match)) {
-             return $match[1];
-         } elseif(preg_match('~<((?:https?://)?[^>]+)>; rel="http://webmention.org/?"~', $result->headers['Link'], $match)) {
-             return $match[1];
+         if (isset($result->headers['Link'])) {
+             // XXX: the fetcher only gives back one of each header, so this may fail on multiple Link headers
+             if(preg_match('~<((?:https?://)?[^>]+)>; rel="webmention"~', $result->headers['Link'], $match)) {
+                 return $match[1];
+             } elseif(preg_match('~<((?:https?://)?[^>]+)>; rel="http://webmention.org/?"~', $result->headers['Link'], $match)) {
+                 return $match[1];
+             }
          }
  
+         // FIXME: Do proper DOM traversal
          if(preg_match('/<(?:link|a)[ ]+href="([^"]+)"[ ]+rel="[^" ]* ?webmention ?[^" ]*"[ ]*\/?>/i', $result->body, $match)
             || preg_match('/<(?:link|a)[ ]+rel="[^" ]* ?webmention ?[^" ]*"[ ]+href="([^"]+)"[ ]*\/?>/i', $result->body, $match)) {
              return $match[1];

diff --cc plugins/OStatus/OStatusPlugin.php
Simple merge

diff --cc plugins/OStatus/classes/Ostatus_profile.php
Simple merge

diff --cc plugins/Oembed/classes/File_oembed.php
Simple merge

diff --cc plugins/TwitterBridge/TwitterBridgePlugin.php
Simple merge

diff --cc scripts/setpassword.php
Simple merge

diff --cc scripts/startdaemons.sh
index c4d86053e92b09d92d26265b292a29d6074ff6fc,2ed3528c5e0d5b28338df53bb43a14d6a6d292f8..0fa72cea118cf0df81d69e9a83cf1806359abdc5
--- 1/scripts/startdaemons.sh
--- 2/scripts/startdaemons.sh
+++ b/scripts/startdaemons.sh
@@@ -35,12 -35,12 +35,14 @@@ if [ $# -gt 1 ]; the
  fi
  
  DIR=`dirname $0`
- DAEMONS=`$DIR/getvaliddaemons.php $ARGSG`
 -DAEMONS=`php $DIR/getvaliddaemons.php $ARGSG`
++DAEMONS=`$DIR/getvaliddaemons.php $ARGSG 2>/dev/null | grep -v "FUSE_EDEADLK"`
++
++echo "DAEMONS='${DAEMONS}'"
  
  for f in $DAEMONS; do
  
--    echo "Starting $f..."
--    php $f $ARGSD
++    echo "Starting '$f' ..."
++    php $f $ARGSD 2>/dev/null | grep -v "FUSE_EDEADLK"
      echo "DONE."
  
  done

diff --cc scripts/stopdaemons.sh
index 274f0903e25a75ad1c5ff5347333b06818625885,e725dd0bf0064588e490eecb90def35bc4d10ba9..e88fe26e22970c17ac944b188b41400f4c76908c
--- 1/scripts/stopdaemons.sh
--- 2/scripts/stopdaemons.sh
+++ b/scripts/stopdaemons.sh
@@@ -39,9 -39,9 +39,9 @@@ if [ $# -gt 1 ]; the
  fi
  
  SDIR=`dirname $0`
- DIR=`$SDIR/getpiddir.php $SITE`
 -DIR=`php $SDIR/getpiddir.php $SITE`
++DIR=`$SDIR/getpiddir.php $SITE 2>/dev/null | grep -v "FUSE_EDEADLK"`
  
- DAEMONS=`$SDIR/getvaliddaemons.php $ARGSG`
 -DAEMONS=`php $SDIR/getvaliddaemons.php $ARGSG`
++DAEMONS=`$SDIR/getvaliddaemons.php $ARGSG 2>/dev/null | grep -v "FUSE_EDEADLK"`
  
  for f in $DAEMONS; do
      f=$(basename $f .php)
@@@ -52,7 -52,7 +52,7 @@@
  
                PID=`cat $ff 2>/dev/null`
                if [ -n "$PID" ] ; then
--                      echo -n "Stopping $f ($PID)..."
++                      echo -n "Stopping '$f' ($PID)..."
                        if kill -3 $PID 2>/dev/null ; then
                                count=0
                                while kill -0 $PID 2>/dev/null ;  do