8 Коммиты 7e10d1eb96 ... 16e8440dff

Автор SHA1 Сообщение Дата
  Stefan Stidl 16e8440dff chore(release): prepare v6.2.0 1 неделя назад
  sstidl be1c7f87a7 Merge pull request #798 from akirayamamoto/fix/php-post-max-size-upload-chunks 1 неделя назад
  Akira Yamamoto 265c42d4bf docs: trim Docker PHP ini comments 1 месяц назад
  Akira Yamamoto 914a29de7a docker: simplify Alpine PHP ini install 1 месяц назад
  Akira Yamamoto a30872a4e8 docs: shorten PHP upload limit comment 1 месяц назад
  Akira Yamamoto 0feb8b5042 docs: update Alpine PHP ini comment 1 месяц назад
  Akira Yamamoto db4a5f8d5a docker: drop runtime PHP scan-dir discovery for env var + apk path glob 3 месяцев назад
  Akira Yamamoto 3b3cddeb41 fix(docker): raise PHP post_max_size for default 20MB upload chunks 3 месяцев назад
6 измененных файлов с 21 добавлено и 3 удалено
  1. 2 0
      Dockerfile
  2. 11 0
      Dockerfile.alpine
  3. 1 1
      doc.md
  4. 5 0
      docker/librespeed-php.ini
  5. 1 1
      package.json
  6. 1 1
      speedtest.js

+ 2 - 0
Dockerfile

@@ -10,6 +10,8 @@ RUN install-php-extensions iconv gd pdo pdo_mysql pdo_pgsql pgsql \
     && apt-get clean \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 
+COPY docker/librespeed-php.ini ${PHP_INI_DIR}/conf.d/99-librespeed.ini
+
 # Prepare files and folders
 # Prepare files and folders
 RUN mkdir -p /speedtest/
 RUN mkdir -p /speedtest/
 
 

+ 11 - 0
Dockerfile.alpine

@@ -20,6 +20,17 @@ RUN apk add --quiet --no-cache \
 RUN ln -sf /dev/stdout /var/log/apache2/access.log && \
 RUN ln -sf /dev/stdout /var/log/apache2/access.log && \
     ln -sf /dev/stderr /var/log/apache2/error.log
     ln -sf /dev/stderr /var/log/apache2/error.log
 
 
+# Install the ini into the scan dir PHP itself reports.
+COPY docker/librespeed-php.ini /tmp/librespeed-php.ini
+RUN set -eu; \
+    scan_dir="$(php -r 'echo rtrim(PHP_CONFIG_FILE_SCAN_DIR);')"; \
+    if [ -z "$scan_dir" ]; then \
+      echo "ERROR: PHP_CONFIG_FILE_SCAN_DIR is empty" >&2; \
+      exit 1; \
+    fi; \
+    install -m 0644 /tmp/librespeed-php.ini "$scan_dir/99-librespeed.ini"; \
+    rm /tmp/librespeed-php.ini
+
 # Prepare files and folders
 # Prepare files and folders
 RUN mkdir -p /speedtest/
 RUN mkdir -p /speedtest/
 
 

+ 1 - 1
doc.md

@@ -1,7 +1,7 @@
 # LibreSpeed
 # LibreSpeed
 
 
 > by Federico Dossena
 > by Federico Dossena
-> Version 6.1.0
+> Version 6.2.0
 > [https://github.com/librespeed/speedtest/](https://github.com/librespeed/speedtest/)
 > [https://github.com/librespeed/speedtest/](https://github.com/librespeed/speedtest/)
 
 
 ## Introduction
 ## Introduction

+ 5 - 0
docker/librespeed-php.ini

@@ -0,0 +1,5 @@
+; speedtest_worker.js defaults xhr_ul_blob_megabytes to 20.
+; PHP's stock post_max_size = 8M rejects those upload chunks before
+; empty.php can send its headers. 32M leaves modest headroom.
+
+post_max_size = 32M

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
 {
   "name": "librespeed-speedtest",
   "name": "librespeed-speedtest",
-  "version": "6.1.0",
+  "version": "6.2.0",
   "description": "LibreSpeed - A Free and Open Source speed test that you can host on your server(s)",
   "description": "LibreSpeed - A Free and Open Source speed test that you can host on your server(s)",
   "main": "speedtest.js",
   "main": "speedtest.js",
   "scripts": {
   "scripts": {

+ 1 - 1
speedtest.js

@@ -49,7 +49,7 @@ function Speedtest() {
   this._settings = {}; //settings for the speed test worker
   this._settings = {}; //settings for the speed test worker
   this._state = 0; //0=adding settings, 1=adding servers, 2=server selection done, 3=test running, 4=done
   this._state = 0; //0=adding settings, 1=adding servers, 2=server selection done, 3=test running, 4=done
   console.log(
   console.log(
-    "LibreSpeed by Federico Dossena v6.1.0 - https://github.com/librespeed/speedtest"
+    "LibreSpeed by Federico Dossena v6.2.0 - https://github.com/librespeed/speedtest"
   );
   );
 }
 }