diff options
| author | redmatrix <git@macgirvin.com> | 2016-02-08 13:57:40 -0800 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-02-08 13:57:40 -0800 |
| commit | be99c7fe12cc68bba1716a0b708bb171cfd223e6 (patch) | |
| tree | b8155c550a3ab4d756f97e385f6b9c1f92091cc8 | |
| parent | 00ae6bdac6062594d16870dbd9ca0593f534198e (diff) | |
| download | volse-hubzilla-be99c7fe12cc68bba1716a0b708bb171cfd223e6.tar.gz volse-hubzilla-be99c7fe12cc68bba1716a0b708bb171cfd223e6.tar.bz2 volse-hubzilla-be99c7fe12cc68bba1716a0b708bb171cfd223e6.zip | |
sort out the well-known acme-challenge mess - at least on apache
| -rw-r--r-- | .htaccess | 1 | ||||
| -rw-r--r-- | mod/_well_known.php | 15 | ||||
| -rw-r--r-- | version.inc | 2 |
3 files changed, 6 insertions, 12 deletions
@@ -24,6 +24,7 @@ AddType audio/ogg .oga # Also place auth information into REMOTE_USER for sites running # in CGI mode. + RewriteCond %{REQUEST_URI} ^/\.well\-known/.* RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-d RewriteRule ^(.*)$ index.php?q=$1 [E=REMOTE_USER:%{HTTP:Authorization},L,QSA] diff --git a/mod/_well_known.php b/mod/_well_known.php index 47cfe1512..46714deaa 100644 --- a/mod/_well_known.php +++ b/mod/_well_known.php @@ -49,19 +49,12 @@ function _well_known_init(&$a){ break;
default:
- // look in $WEBROOT/well_known for the requested file in case it is
- // something a site requires and for which we do not have a module
-
- // @fixme - we may need to determine the content-type and stick it in the header
- // for now this can be done with a php script masquerading as the requested file
-
- $wk_file = str_replace('.well-known','well_known',$a->cmd);
- if(file_exists($wk_file)) {
- echo file_get_contents($wk_file);
+ if(file_exists($a->cmd)) {
+ echo file_get_contents($a->cmd);
killme();
}
- elseif(file_exists($wk_file . '.php'))
- require_once($wk_file . '.php');
+ elseif(file_exists($a->cmd . '.php'))
+ require_once($a->cmd . '.php');
break;
}
diff --git a/version.inc b/version.inc index edcf6442a..6778af819 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2016-02-07.1302H +2016-02-08.1303H |