[arch-commits] Commit in hhvm/trunk (3 files)

[Massimiliano Torromeo]

    Date: Friday, March 27, 2015 @ 11:38:48
  Author: mtorromeo
Revision: 130028

upgpkg: hhvm 3.6.1-1

Updated to version 3.6.1

Modified:
  hhvm/trunk/PKGBUILD
Deleted:
  hhvm/trunk/fastcgi-https.diff
  hhvm/trunk/mcrouter-chrono-fix.patch

---------------------------+
 PKGBUILD                  |   15 ++++-----------
 fastcgi-https.diff        |   41 -----------------------------------------
 mcrouter-chrono-fix.patch |   25 -------------------------
 3 files changed, 4 insertions(+), 77 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-27 10:12:46 UTC (rev 130027)
+++ PKGBUILD	2015-03-27 10:38:48 UTC (rev 130028)
@@ -3,7 +3,7 @@
 # Contributor: James Miller <james at pocketrent.com>
 
 pkgname=hhvm
-pkgver=3.6.0
+pkgver=3.6.1
 pkgrel=1
 
 _thirdparty_commit=3bf14f9194bff0f681ee60bc6e5f1ac60b233f5c
@@ -12,7 +12,6 @@
 _proxygen_commit=d17b4e7735ab728d77266a538cef4dcfc57b5fbd
 _webscalesql_commit=004b6b348fdf48f0aa4e3fe1010b891d4fdb9f70
 _mcrouter_commit=addcc91aee3942f4e50760a43fdcb052482be00e
-_re2_commit=bdb5058dcf7a3e6e8fe524a6214d5a7a6e9dcba2
 _squangle_commit=269cd2e30a88b16b1cdf12f1eec5a1c16cb8be10
 
 pkgdesc="Virtual Machine, Runtime, and JIT for PHP"
@@ -36,9 +35,7 @@
         'hhvm.service'
         'hhvm at .service'
         'php.ini'
-        'server.ini'
-        'mcrouter-chrono-fix.patch'
-        'fastcgi-https.diff')
+        'server.ini')
 install=hhvm.install
 backup=(etc/hhvm/{php,server}.ini)
 options+=('!buildflags')
@@ -45,8 +42,6 @@
 
 prepare() {
     cd "$srcdir"/$pkgname-HHVM-$pkgver
-    patch -p1 -i "$srcdir"/mcrouter-chrono-fix.patch
-    patch -p1 -i "$srcdir"/fastcgi-https.diff
 
     # Fix sendmail path
     sed -r 's#/usr/lib/sendmail#/usr/bin/sendmail#g' -i \
@@ -127,7 +122,7 @@
     install -Dm644 server.ini "$pkgdir"/etc/hhvm/server.ini
 }
 
-sha256sums=('5840d7caf7f8b57e35953e98fa89fa697f810c8de784950f31953cf36f9ce987'
+sha256sums=('d7af553ee149c026ded7728e68fea876806496c3e1d26e3b49c08da641e0b5db'
             '67594f86a25d3c1b468b0b4255018df8442db811899b41432775f031938cbd8f'
             'f09a38084cc4b8c9cc2ac70daf025d7c2f1710c2eae38fd7aec2b6c29b6e70aa'
             'd58cbfc110761bd70b74b849b3eb83b3e43e066cbf1969f403d47630a22d5bef'
@@ -139,6 +134,4 @@
             '8b50d1ef9f5f726e6d8d469a8c84d85ad63f8b507b97d258b4d751a0e3e221df'
             '59c640602929dac0aa34d06c668ed69361eb4b7b47a77f9aa0badb4d0b61571c'
             '3e3093f817706c238fad021483f114fd4ce0b45d84097dcb7870157fc9ec769f'
-            '5b53bc57965e1c5151d720dc7f63f1b2e8ebd5e758b2ef0be3b74df38ebcbce0'
-            '5994219fe94d22f135f8cf6ea312e8096204c19da7c3a460c3c26d62e14c291d'
-            '632c3e83e45fbf834415e037e7fc1555ada6d8e09063644a9d23872cb1d499de')
+            '5b53bc57965e1c5151d720dc7f63f1b2e8ebd5e758b2ef0be3b74df38ebcbce0')

Deleted: fastcgi-https.diff
===================================================================
--- fastcgi-https.diff	2015-03-27 10:12:46 UTC (rev 130027)
+++ fastcgi-https.diff	2015-03-27 10:38:48 UTC (rev 130028)
@@ -1,41 +0,0 @@
-diff --git a/hphp/runtime/server/fastcgi/fastcgi-transport.cpp b/hphp/runtime/server/fastcgi/fastcgi-transport.cpp
---- a/hphp/runtime/server/fastcgi/fastcgi-transport.cpp
-+++ b/hphp/runtime/server/fastcgi/fastcgi-transport.cpp
-@@ -298,7 +298,7 @@
-   }
-
-   // IIS sets this value but sets it to off when SSL is off.
--  if (m_requestParams.count("HTTPS") &&
-+  if (m_requestParams.count("HTTPS") && !m_requestParams["HTTPS"].empty() &&
-       strcasecmp(m_requestParams["HTTPS"].c_str(), "OFF")) {
-     setSSL();
-   }
-diff --git a/hphp/test/server/fastcgi/server_root/test_https.php b/hphp/test/server/fastcgi/server_root/test_https.php
-new file mode 100644
---- /dev/null
-+++ b/hphp/test/server/fastcgi/server_root/test_https.php
-@@ -0,0 +1,2 @@
-+<?php
-+var_dump($_SERVER['HTTPS']);
-diff --git a/hphp/test/server/fastcgi/tests/httpsTest.php b/hphp/test/server/fastcgi/tests/httpsTest.php
-new file mode 100644
---- /dev/null
-+++ b/hphp/test/server/fastcgi/tests/httpsTest.php
-@@ -0,0 +1,11 @@
-+<?php
-+
-+require_once('test_base.inc');
-+
-+function httpsTestController($serverPort) {
-+  $args = array('HTTPS' => '');
-+  var_dump(request(php_uname('n'), $serverPort, "test_https.php",
-+                  [], [], $args));
-+}
-+
-+runTest("httpsTestController");
-diff --git a/hphp/test/server/fastcgi/tests/httpsTest.php.expect b/hphp/test/server/fastcgi/tests/httpsTest.php.expect
-new file mode 100644
---- /dev/null
-+++ b/hphp/test/server/fastcgi/tests/httpsTest.php.expect
-@@ -0,0 +1 @@
-+string(12) "string(0) """

Deleted: mcrouter-chrono-fix.patch
===================================================================
--- mcrouter-chrono-fix.patch	2015-03-27 10:12:46 UTC (rev 130027)
+++ mcrouter-chrono-fix.patch	2015-03-27 10:38:48 UTC (rev 130028)
@@ -1,25 +0,0 @@
-diff --git a/CMake/HPHPSetup.cmake b/CMake/HPHPSetup.cmake
-index 48e7da7..7585b24 100644
---- a/CMake/HPHPSetup.cmake
-+++ b/CMake/HPHPSetup.cmake
-@@ -230,15 +230,16 @@ if (NOT FASTLZ_LIBRARY)
-   include_directories("${TP_DIR}/fastlz")
- endif()
- 
--if (ENABLE_MCROUTER)
--  include_directories("${TP_DIR}/mcrouter")
--endif()
--
- include_directories("${TP_DIR}/timelib")
- include_directories("${TP_DIR}/libafdt/src")
- include_directories("${TP_DIR}/libmbfl")
- include_directories("${TP_DIR}/libmbfl/mbfl")
- include_directories("${TP_DIR}/libmbfl/filter")
-+
-+if (ENABLE_MCROUTER)
-+  include_directories("${TP_DIR}/mcrouter")
-+endif()
-+
- add_definitions(-DNO_LIB_GFLAGS)
- include_directories("${TP_DIR}/folly")
- include_directories("${TP_DIR}/thrift")