adsr

DEBUG: All tests passed.
DEBUG:               |    |    |
DEBUG:              )_)  )_)  )_)
DEBUG:             )___))___))___)\
DEBUG:            )____)____)_____)\
DEBUG:          _____|____|____|____\\__
DEBUG: ---------\      SHIP IT      /---------
DEBUG:   ^^^^^ ^^^^^^^^^^^^^^^^^^^^^
DEBUG:     ^^^^      ^^^^     ^^^    ^^
DEBUG:          ^^^^      ^^^

adsr

diff --git a/hphp/runtime/vm/unit-inl.h b/hphp/runtime/vm/unit-inl.h
index a678af3..5ce8ef6 100644
--- a/hphp/runtime/vm/unit-inl.h
+++ b/hphp/runtime/vm/unit-inl.h
@@ -48,20 +48,24 @@ inline void SourceLoc::setLoc(const Location* l) {
 inline bool SourceLoc::same(const SourceLoc* l) const {
   return (this == l) ||
          (line0 == l->line0 && char0 == l->char0 &&
           line1 == l->line1 && char1 == l->char1);
 }

adsr

final class C {
  const C1 = 0;
  const C2 = 1;
  static public $s = array(
    0 => 'a',
    1 => 'b',
  );
}

adsr

Index: ncat_listen.c
===================================================================
--- ncat_listen.c	(revision 34570)
+++ ncat_listen.c	(working copy)
@@ -836,7 +836,7 @@
         }
 
         FD_SET(socket_n, &read_fds);
-        FD_SET(STDIN_FILENO, &read_fds);
+        if (!o.recvonly) FD_SET(STDIN_FILENO, &read_fds);

adsr

Index: ncat/ncat_listen.c
===================================================================
--- ncat/ncat_listen.c	(revision 34570)
+++ ncat/ncat_listen.c	(working copy)
@@ -836,7 +836,7 @@
         }
 
         FD_SET(socket_n, &read_fds);
-        FD_SET(STDIN_FILENO, &read_fds);
+        if (!o.recvonly) FD_SET(STDIN_FILENO, &read_fds);

adsr

Index: ncat/ncat_listen.c
===================================================================
--- ncat/ncat_listen.c	(revision 34570)
+++ ncat/ncat_listen.c	(working copy)
@@ -522,7 +522,7 @@
             netexec(&sinfo, o.cmdexec);
     } else {
         /* Now that a client is connected, pay attention to stdin. */
-        if (!stdin_eof)
+        if (!stdin_eof && !o.recvonly)

adsr

diff --git a/sapi/apache2handler/php_apache.h b/sapi/apache2handler/php_apache.h
index d0673e1..6b99703 100644
--- a/sapi/apache2handler/php_apache.h
+++ b/sapi/apache2handler/php_apache.h
@@ -46,6 +46,7 @@ typedef struct php_struct {
 	int request_processed;
 	/* final content type */
 	char *content_type;
+    int request_startup_ran;
 } php_struct;

adsr

diff --git a/CMake/GeoIP.cmake b/CMake/GeoIP.cmake
index 0f29bd5..5961a0e 100644
--- a/CMake/GeoIP.cmake
+++ b/CMake/GeoIP.cmake
@@ -10,7 +10,7 @@ CHECK_LIBRARY_EXISTS(GeoIP GeoIP_open /usr/lib HAVE_LIBGEOIP)
 if(${HAVE_LIBGEOIP})
     # Find library that contains version number in the file name.
     execute_process(
-        COMMAND find /usr/lib -name "xlibGeoIP.*.*.*.*"
+        COMMAND find /usr/lib -name "libGeoIP.*.*.*.*"

adsr

diff --git a/sapi/apache2handler/apache_config.c b/sapi/apache2handler/apache_config.c
index 76d3ee2..b4f2097 100644
--- a/sapi/apache2handler/apache_config.c
+++ b/sapi/apache2handler/apache_config.c
@@ -1,15 +1,15 @@
 /*
    +----------------------------------------------------------------------+
-   | PHP Version 5                                                        |
+   | PHP Version 7                                                        |
    +----------------------------------------------------------------------+

adsr

* commit c256649d63322630ce2e9665ba4b57d4b0eee01e
| Author: Xinchen Hui <[email protected]>
| Date:   Wed Sep 23 07:08:51 2015 -0700
| 
|     Fixed memleaks in apache2handler
| 
| diff --git a/sapi/apache2handler/apache_config.c b/sapi/apache2handler/apache_config.c
| index 636eee2..b4f2097 100644
| --- a/sapi/apache2handler/apache_config.c
| +++ b/sapi/apache2handler/apache_config.c