Fix #4492 (#4514)

* Update Codeigniter to v3.1.10

* Update nginx config

* Disable db persistent connection
Fix #4492

* Try to change for citrine
But without results

* Delete codeigniter hhvm
hhvm V4 no php https://hhvm.com/blog/2019/02/11/hhvm-4.0.0.html

* Delete hhvm from benchmark_config

frameworks/PHP/codeigniter/application/config/database.php

@@ -54,8 +54,8 @@ $db['default']['password'] = 'benchmarkdbpass';
 $db['default']['database'] = 'hello_world';
 $db['default']['dbdriver'] = 'mysqli';
 $db['default']['dbprefix'] = '';
-$db['default']['pconnect'] = TRUE;
-$db['default']['db_debug'] = TRUE;
+$db['default']['pconnect'] = FALSE;
+$db['default']['db_debug'] = FALSE;
 $db['default']['cache_on'] = FALSE;
 $db['default']['cachedir'] = '';
 $db['default']['char_set'] = 'utf8';

frameworks/PHP/codeigniter/benchmark_config.json

@@ -21,27 +21,6 @@
       "display_name": "codeigniter",
       "notes": "",
       "versus": "php"
-    },
-    "hhvm": {
-      "json_url": "/index.php/bench/json",
-      "db_url": "/index.php/bench/db",
-      "query_url": "/index.php/bench/db/",
-      "fortune_url": "/index.php/bench/fortunes",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Fullstack",
-      "database": "MySQL",
-      "framework": "codeigniter",
-      "language": "PHP",
-      "flavor": "HHVM",
-      "orm": "Raw",
-      "platform": "None",
-      "webserver": "nginx",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "codeigniter_hhvm",
-      "notes": "",
-      "versus": "php"
     }
   }]
 }

frameworks/PHP/codeigniter/codeigniter-hhvm.dockerfile

@@ -1,20 +0,0 @@
-FROM ubuntu:18.10
-
-ARG DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update -yqq && apt-get install -yqq software-properties-common apt-transport-https > /dev/null
-RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xB4112585D386EB94
-RUN add-apt-repository https://dl.hhvm.com/ubuntu
-RUN apt-get update -yqq > /dev/null && \
-    apt-get install -yqq hhvm nginx git unzip php7.3 php7.3-common php7.3-cli php7.3-fpm php7.3-mysql php7.3-xml php7.3-mbstring  > /dev/null
-
-RUN apt-get install -yqq composer > /dev/null
-
-ADD ./ /codeigniter
-WORKDIR /codeigniter
-
-RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
-
-CMD hhvm -m daemon --config /codeigniter/deploy/config.hdf && \
-    nginx -c /codeigniter/deploy/nginx-hhvm.conf -g "daemon off;"

frameworks/PHP/codeigniter/codeigniter.dockerfile

@@ -15,6 +15,9 @@ ADD ./ /codeigniter
 WORKDIR /codeigniter
 
 RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/7.3/fpm/php-fpm.conf ; fi;
+ARG BENCHMARK_ENV
+RUN if [ ${BENCHMARK_ENV} = citrine ]; then sed -i "s|$db['default']['pconnect'] = FALSE;|$db['default']['pconnect'] = TRUE;|g" application/config/database.php ; fi;
+#RUN if [ $BENCHMARK_ENV = citrine ]; then sed -i "s|$db['default']['pconnect'] = FALSE;|$db['default']['pconnect'] = TRUE;|g" application/config/database.php ; fi;
 
 RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
 

frameworks/PHP/codeigniter/composer.json

@@ -1,5 +1,5 @@
 {
     "require": {
-        "codeigniter/framework": "3.0.6"
+        "codeigniter/framework": "3.1.10"
     }
 }

frameworks/PHP/codeigniter/composer.lock

@@ -1,50 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
-        "This file is @generated automatically"
-    ],
-    "content-hash": "5d9e345faac86f61cf4288da91bf779b",
-    "packages": [
-        {
-            "name": "codeigniter/framework",
-            "version": "3.0.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/bcit-ci/CodeIgniter.git",
-                "reference": "8082544c5b4b33175790f505587e202e3ca9e488"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/bcit-ci/CodeIgniter/zipball/8082544c5b4b33175790f505587e202e3ca9e488",
-                "reference": "8082544c5b4b33175790f505587e202e3ca9e488",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.2.4"
-            },
-            "require-dev": {
-                "mikey179/vfsstream": "1.1.*"
-            },
-            "suggest": {
-                "paragonie/random_compat": "Provides better randomness in PHP 5.x"
-            },
-            "type": "project",
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "The CodeIgniter framework",
-            "homepage": "https://codeigniter.com",
-            "time": "2016-03-21T16:26:30+00:00"
-        }
-    ],
-    "packages-dev": [],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": [],
-    "platform-dev": []
-}

frameworks/PHP/codeigniter/deploy/nginx-fpm.conf

@@ -1,23 +1,42 @@
 user www-data;
 worker_processes  auto;
 error_log stderr error;
-worker_rlimit_nofile 200000;
+#worker_rlimit_nofile 200000;
 
 events {
   worker_connections 16384;
 }
 
 http {
-  include /etc/nginx/mime.types;
-  default_type application/octet-stream;
-  access_log off;
-  server_tokens off;
-  sendfile on;
-  keepalive_timeout 65;
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+    access_log off;
+    server_tokens off;
+
+    sendfile on;
+    tcp_nopush on;
+    tcp_nodelay on;
+    keepalive_timeout 65;
+
+    open_file_cache max=2000 inactive=20s;
+    open_file_cache_valid 60s;
+    open_file_cache_min_uses 5;
+    open_file_cache_errors off;
+
+    #FastCGI optimizations
+    fastcgi_buffers 256 16k;
+    fastcgi_buffer_size 128k;
+    fastcgi_connect_timeout 30s;
+    fastcgi_send_timeout 60s;
+    fastcgi_read_timeout 60s;
+    fastcgi_busy_buffers_size 256k;
+    fastcgi_temp_file_write_size 256k;
+    reset_timedout_connection on;
+    server_names_hash_bucket_size 100;
 
   upstream fastcgi_backend {
     server unix:/var/run/php/php7.3-fpm.sock;
-    keepalive 50;
+    keepalive 40;
   }
 
   server {