Merge branch 'master' of gitlab.techempower.com:techempower/frameworkbenchmarks

cake/README.md

@@ -19,8 +19,8 @@ Uses the CakePHP Model functionality.
 The tests were run with:
 
 * [Cake Version 2.3.0](http://cakephp.org/)
-* [PHP Version 5.3.10](http://www.php.net/)
-* [Apache Version 2.2.22](http://httpd.apache.org/)
+* [PHP Version 5.4.13](http://www.php.net/) with FPM and APC
+* [nginx 1.2.7](http://nginx.org/)
 * [MySQL 5.5.29](https://dev.mysql.com/)
 
 Cake Debug mode is set to 0 in [core.php](app/Config/core.php), as
@@ -31,12 +31,12 @@ To support the Cake JsonView, we also made a [routes configuration change](app/C
 ## Test URLs
 ### JSON Encoding Test
 
-http://localhost/cake/index.php/json.json
+http://localhost/index.php/json.json
 
 ### Data-Store/Database Mapping Test
 
-http://localhost/cake/index.php/world.json
+http://localhost/index.php/world.json
 
 ### Variable Query Test
     
-http://localhost/cake/index.php/world.json?queries=2
+http://localhost/index.php/world.json?queries=2

php/README.md

@@ -15,29 +15,29 @@ Use the PHP standard [JSON encoder](http://www.php.net/manual/en/function.json-e
 ## Infrastructure Software Versions
 The tests were run with:
 
-* [PHP Version 5.3.10](http://www.php.net/)
-* [Apache Version 2.2.22](http://httpd.apache.org/)
+* [PHP Version 5.4.13](http://www.php.net/) with FPM and APC
+* [nginx 1.2.7](http://nginx.org/)
 * [MySQL 5.5.29](https://dev.mysql.com/)
 * [PHP ActiveRecord Nightly 20121221](http://www.phpactiverecord.org/)
 
 ## Test URLs
 ### JSON Encoding Test
 
-http://localhost/php/json.php
+http://localhost/json.php
 
 
 ### Data-Store/Database Mapping Test
 
 Raw:
-http://localhost/php/dbraw.php
+http://localhost/dbraw.php
 
 ORM:
-http://localhost/php/dborm.php
+http://localhost/dborm.php
 
 ### Variable Query Test
 
 Raw:
-http://localhost/php/dbraw.php?queries=5
+http://localhost/dbraw.php?queries=5
 
 ORM:
-http://localhost/php/dborm.php?queries=5
+http://localhost/dborm.php?queries=5