Merge pull request #2142 from TechEmpower/master

Merging master changes into round-14
TechEmpower · Jul 6, 2016 · fb0271ce2debf9ca6682bfbe0f720391bf7e3a37 · fb0271c
2 parents 768d840 + 34b8844
commit fb0271ce2debf9ca6682bfbe0f720391bf7e3a37
Unified Split

Showing with 7 additions and 2 deletions.

+1 −0 frameworks/PHP/cygnite-php-framework/apps/controllers/BenchController.php

+5 −2 frameworks/PHP/cygnite-php-framework/apps/views/bench/fortunes.view.php

+1 −0 frameworks/PHP/cygnite-php-framework/benchmark_config.json
diff --git a/frameworks/PHP/cygnite-php-framework/apps/controllers/BenchController.php b/frameworks/PHP/cygnite-php-framework/apps/controllers/BenchController.php
@@ -67,6 +67,7 @@ public function fortunesAction()
                return -1;
            }
        });
+		header('Content-Type: text/html; charset=utf-8');
        $this->render('fortunes', array(
                'fortunes' => $fortunes
        ));
diff --git a/frameworks/PHP/cygnite-php-framework/apps/views/bench/fortunes.view.php b/frameworks/PHP/cygnite-php-framework/apps/views/bench/fortunes.view.php
@@ -1,6 +1,9 @@
 <!DOCTYPE html>
 <html>
-<head><title>Fortunes</title></head>
+<head>
+    <title>Fortunes</title>
+</head>
+
 <body>
 <table>
    <tr>
@@ -17,4 +20,4 @@

 </table>
 </body>
-</html>
+</html>
diff --git a/frameworks/PHP/cygnite-php-framework/benchmark_config.json b/frameworks/PHP/cygnite-php-framework/benchmark_config.json
@@ -24,6 +24,7 @@
      "setup_file": "setup",
      "db_url": "/index.php/bench/db",
      "query_url": "/index.php/bench/queries/",
+      "fortune_url": "/index.php/bench/fortunes",
      "port": 8080,
      "approach": "Realistic",
      "classification": "Fullstack",