relax content-type check on yadi discovery document

[friendica.git] / mod / salmon.php

diff --git a/mod/salmon.php b/mod/salmon.php
index 2acb094c31c8b4cc4a9b274aa669e4314f2ee9b5..3c62a6d8c556bb6eff1676e8987ad601fd69b567 100644 (file)
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -14,7 +14,7 @@ function salmon_return($val) {
 
        if($val >= 400)
                $err = 'Error';
-       if($val == 200)
+       if($val >= 200 && $val < 300)
                $err = 'OK';
 
        logger('mod-salmon returns ' . $val);   
@@ -158,8 +158,10 @@ function salmon_post(&$a) {
 
     $verify = $rsa->verify($signed_data,$signature);
 
-       if(! $verify)
+       if(! $verify) {
+               logger('mod-salmon: message did not verify using protocol. Trying statusnet hack.');
            $verify = $rsa->verify($stnet_signed_data,$signature);
+    }
 
        if(! $verify) {
                logger('mod-salmon: Message did not verify. Discarding.');
@@ -186,7 +188,7 @@ function salmon_post(&$a) {
        }       
        if((count($r)) && ($r[0]['readonly'])) {
                logger('mod-salmon: Ignoring this author.');
-               salmon_return(200);
+               salmon_return(202);
                // NOTREACHED
        }