backport pypy plugin changes

unbit · Nov 4, 2024 · b6aabc3 · b6aabc3
1 parent d161714
commit b6aabc3
Show file tree

Hide file tree

Showing 3 changed files with 247 additions and 185 deletions.
diff --git a/plugins/pypy/pypy_plugin.c b/plugins/pypy/pypy_plugin.c
@@ -179,6 +179,15 @@ static int uwsgi_pypy_init() {
 		if (start && end) {
 			buffer = uwsgi_concat2n(start, end-start, "", 0);
 		}
+#if defined(__APPLE__)
+		else {
+			unsigned long setup_size = 0;
+			char *setup_data = (char*)getsectiondata(&_mh_execute_header, "__DATA", "pypy_setup", &setup_size);
+			if (setup_data) {
+				buffer = uwsgi_concat2n(setup_data, setup_size, "", 0);
+			}
+		}
+#endif
 	}
 
 	if (!buffer) {
@@ -224,7 +233,7 @@ static void uwsgi_pypy_preinit_apps() {
 
 static int uwsgi_pypy_request(struct wsgi_request *wsgi_req) {
 	/* Standard WSGI request */
-        if (!wsgi_req->uh->pktsize) {
+        if (!wsgi_req->len) {
                 uwsgi_log( "Empty pypy request. skip.\n");
                 return -1;
         }