diff options
| -rw-r--r-- | .gitlab-ci.yml | 41 | ||||
| -rw-r--r-- | Zotlabs/Zot/Finger.php | 2 |
2 files changed, 1 insertions, 42 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 354d53430..000000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,41 +0,0 @@ -# Select image from https://hub.docker.com/_/php/ -image: php:7.1 - -# Select what we should cache -cache: - paths: - - vendor/ - -before_script: -# Install git, the php image doesn't have installed -- apt-get update -yqq -- apt-get install git -yqq - -# Install php-gd -- apt-get install libfreetype6-dev libjpeg62-turbo-dev libpng-dev -yqq -- docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ -- docker-php-ext-install -j$(nproc) gd - -# Install mysql driver -- docker-php-ext-install pdo_mysql - -# Install composer -- curl -sS https://getcomposer.org/installer | php - -# Install all project dependencies -- php composer.phar install - -services: -- mysql - -variables: - # Configure mysql service (https://hub.docker.com/_/mysql/) - MYSQL_DATABASE: hello_world_test - MYSQL_ROOT_PASSWORD: mysql - -# We test PHP7 (the default) with MySQL -test:mysql: - script: - - vendor/bin/phpunit --configuration phpunit_mysql.xml --coverage-text - - diff --git a/Zotlabs/Zot/Finger.php b/Zotlabs/Zot/Finger.php index 1d20f5822..77634777a 100644 --- a/Zotlabs/Zot/Finger.php +++ b/Zotlabs/Zot/Finger.php @@ -93,7 +93,7 @@ class Finger { $headers = []; $headers['X-Zot-Channel'] = $channel['channel_address'] . '@' . \App::get_hostname(); $headers['X-Zot-Nonce'] = random_string(); - $headers['Host'] = $parsed['host']; + $headers['Host'] = $parsed_host; $xhead = \Zotlabs\Web\HTTPSig::create_sig('',$headers,$channel['channel_prvkey'], 'acct:' . $channel['channel_address'] . '@' . \App::get_hostname(),false); |