Skip to content

Instantly share code, notes, and snippets.

@jjergus
jjergus / hhvm.diff
Created July 17, 2020 02:21
socket stuff
diff --git a/hphp/runtime/ext/hsl/ext_hsl_os.cpp b/hphp/runtime/ext/hsl/ext_hsl_os.cpp
index 9a20a4f1a2..19dba5ba6d 100644
--- a/hphp/runtime/ext/hsl/ext_hsl_os.cpp
+++ b/hphp/runtime/ext/hsl/ext_hsl_os.cpp
@@ -389,9 +389,10 @@ struct HSLFileDescriptor {
return fd;
}
- void close() {
+ void close(bool sd) {
@jjergus
jjergus / hhvm.diff
Created July 18, 2020 02:57
PoC fix for asyncpoll blocked forever after close
diff --git a/hphp/runtime/base/file-await.cpp b/hphp/runtime/base/file-await.cpp
index 6414eac085..78a3cdb366 100644
--- a/hphp/runtime/base/file-await.cpp
+++ b/hphp/runtime/base/file-await.cpp
@@ -21,6 +21,12 @@ void FileEventHandler::handlerReady(uint16_t events) noexcept {
/////////////////////////////////////////////////////////////////////////////
+void FileAwait::jj_cancel() {
+ if (m_file) {
diff --git a/src/network/_Private/CancelablePoller.php b/src/network/_Private/CancelablePoller.php
deleted file mode 100644
index 9cc13c8..0000000
--- a/src/network/_Private/CancelablePoller.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?hh
-/*
- * Copyright (c) 2004-present, Facebook, Inc.
- * All rights reserved.
diff --git a/src/site/xhp/ui-notice.php b/src/site/xhp/ui-notice.php
index 394e3125..59ab6331 100644
--- a/src/site/xhp/ui-notice.php
+++ b/src/site/xhp/ui-notice.php
@@ -9,38 +9,39 @@
*
*/
+namespace HHVM\UserDocumentation\XHP\Examples\ui;
+
@jjergus
jjergus / build-old-vs-new.patch
Created November 13, 2020 22:51
build-old-vs-new.patch
diff -ur build-old/final/build_id.txt build-final2/final/build_id.txt
--- build-old/final/build_id.txt 2020-11-13 12:41:51.389101524 -0800
+++ build-final2/final/build_id.txt 2020-11-13 14:30:18.697239577 -0800
@@ -1 +1 @@
-HHVM=HHVM-4.83.0:HSL=v4.41.0:2020-11-13T12:41:00-0800:1fa47f258c6b68f8ec01899aa82fd6ffa0957109
+HHVM=HHVM-4.83.0:HSL=v4.41.0:2020-11-13T14:25:10-0800:1fa47f258c6b68f8ec01899aa82fd6ffa0957109
diff -ur build-old/final/guides-html/hack/asynchronous-operations/examples.html build-final2/final/guides-html/hack/asynchronous-operations/examples.html
--- build-old/final/guides-html/hack/asynchronous-operations/examples.html 2020-11-13 12:41:51.469107270 -0800
+++ build-final2/final/guides-html/hack/asynchronous-operations/examples.html 2020-11-13 14:30:18.785246371 -0800
@@ -143,9 +143,9 @@
diff -ur old/final/api-html/hack/class.AsyncMysqlClient.method.adoptConnection.html build/final/api-html/hack/class.AsyncMysqlClient.method.adoptConnection.html
--- old/final/api-html/hack/class.AsyncMysqlClient.method.adoptConnection.html 2020-12-01 13:32:11.000000000 -0800
+++ build/final/api-html/hack/class.AsyncMysqlClient.method.adoptConnection.html 2020-12-02 14:00:58.000000000 -0800
@@ -47,7 +47,6 @@
&lt;&lt;__EntryPoint&gt;&gt;
async function run_it(): Awaitable&lt;void&gt; {
- require __DIR__.&quot;/../../__includes/async_mysql_connect.inc.php&quot;;
$sconn = get_synchronous_connection();
$aconn = use_async_connection($sconn);