forked from oraoto/pib
-
-
Notifications
You must be signed in to change notification settings - Fork 51
/
Copy pathphp8.1.patch
195 lines (180 loc) · 7.49 KB
/
php8.1.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
diff --git a/third_party/php8.1-src/ext/openssl/openssl.c b/third_party/php8.1-src/ext/openssl/openssl.c
index a6a05fe..3d61233 100644
--- a/third_party/php8.1-src/ext/openssl/openssl.c
+++ b/third_party/php8.1-src/ext/openssl/openssl.c
@@ -1399,8 +1399,8 @@ PHP_MINIT_FUNCTION(openssl)
/* override the default tcp socket provider */
php_stream_xport_register("tcp", php_openssl_ssl_socket_factory);
- php_register_url_stream_wrapper("https", &php_stream_http_wrapper);
- php_register_url_stream_wrapper("ftps", &php_stream_ftp_wrapper);
+ // php_register_url_stream_wrapper("https", &php_stream_http_wrapper);
+ // php_register_url_stream_wrapper("ftps", &php_stream_ftp_wrapper);
REGISTER_INI_ENTRIES();
diff --git a/third_party/php8.1-src/ext/pdo_sqlite/pdo_sqlite.c b/third_party/php8.1-src/ext/pdo_sqlite/pdo_sqlite.c
index 81761b1..0942423 100644
--- a/third_party/php8.1-src/ext/pdo_sqlite/pdo_sqlite.c
+++ b/third_party/php8.1-src/ext/pdo_sqlite/pdo_sqlite.c
@@ -21,8 +21,8 @@
#include "php.h"
#include "php_ini.h"
#include "ext/standard/info.h"
-#include "pdo/php_pdo.h"
-#include "pdo/php_pdo_driver.h"
+#include "../pdo/php_pdo.h"
+#include "../pdo/php_pdo_driver.h"
#include "php_pdo_sqlite.h"
#include "php_pdo_sqlite_int.h"
#include "zend_exceptions.h"
diff --git a/third_party/php8.1-src/ext/pdo_sqlite/sqlite_driver.c b/third_party/php8.1-src/ext/pdo_sqlite/sqlite_driver.c
index 6d5015e..86be0dd 100644
--- a/third_party/php8.1-src/ext/pdo_sqlite/sqlite_driver.c
+++ b/third_party/php8.1-src/ext/pdo_sqlite/sqlite_driver.c
@@ -21,8 +21,8 @@
#include "php.h"
#include "php_ini.h"
#include "ext/standard/info.h"
-#include "pdo/php_pdo.h"
-#include "pdo/php_pdo_driver.h"
+#include "../pdo/php_pdo.h"
+#include "../pdo/php_pdo_driver.h"
#include "php_pdo_sqlite.h"
#include "php_pdo_sqlite_int.h"
#include "zend_exceptions.h"
diff --git a/third_party/php8.1-src/ext/pdo_sqlite/sqlite_statement.c b/third_party/php8.1-src/ext/pdo_sqlite/sqlite_statement.c
index 90de059..8dc0ad3 100644
--- a/third_party/php8.1-src/ext/pdo_sqlite/sqlite_statement.c
+++ b/third_party/php8.1-src/ext/pdo_sqlite/sqlite_statement.c
@@ -21,8 +21,8 @@
#include "php.h"
#include "php_ini.h"
#include "ext/standard/info.h"
-#include "pdo/php_pdo.h"
-#include "pdo/php_pdo_driver.h"
+#include "../pdo/php_pdo.h"
+#include "../pdo/php_pdo_driver.h"
#include "php_pdo_sqlite.h"
#include "php_pdo_sqlite_int.h"
diff --git a/third_party/php8.1-src/ext/standard/basic_functions.c b/third_party/php8.1-src/ext/standard/basic_functions.c
index ddaf136..4b16633 100755
--- a/third_party/php8.1-src/ext/standard/basic_functions.c
+++ b/third_party/php8.1-src/ext/standard/basic_functions.c
@@ -410,8 +410,8 @@ PHP_MINIT_FUNCTION(basic) /* {{{ */
php_register_url_stream_wrapper("glob", &php_glob_stream_wrapper);
#endif
php_register_url_stream_wrapper("data", &php_stream_rfc2397_wrapper);
- php_register_url_stream_wrapper("http", &php_stream_http_wrapper);
- php_register_url_stream_wrapper("ftp", &php_stream_ftp_wrapper);
+ // php_register_url_stream_wrapper("http", &php_stream_http_wrapper);
+ // php_register_url_stream_wrapper("ftp", &php_stream_ftp_wrapper);
#if defined(PHP_WIN32) || HAVE_DNS_SEARCH_FUNC
# if defined(PHP_WIN32) || HAVE_FULL_DNS_FUNCS
diff --git a/third_party/php8.1-src/ext/tokenizer/tokenizer.c b/third_party/php8.1-src/ext/tokenizer/tokenizer.c
index f3af90c..27b76fc 100644
--- a/third_party/php8.1-src/ext/tokenizer/tokenizer.c
+++ b/third_party/php8.1-src/ext/tokenizer/tokenizer.c
@@ -323,7 +323,7 @@ static void add_token(
zend_hash_next_index_insert_new(Z_ARRVAL_P(return_value), &token);
}
-static bool tokenize(zval *return_value, zend_string *source, zend_class_entry *token_class)
+bool tokenize(zval *return_value, zend_string *source, zend_class_entry *token_class)
{
zval source_zval;
zend_lex_state original_lex_state;
diff --git a/third_party/php8.1-src/main/fastcgi.c b/third_party/php8.1-src/main/fastcgi.c
index 9eb504b..d114fce 100644
--- a/third_party/php8.1-src/main/fastcgi.c
+++ b/third_party/php8.1-src/main/fastcgi.c
@@ -553,6 +553,7 @@ void fcgi_shutdown(void)
{
if (is_initialized) {
zend_hash_destroy(&fcgi_mgmt_vars);
+ is_initialized = 0;
}
is_fastcgi = 0;
if (allowed_clients) {
diff --git a/third_party/php8.1-src/sapi/cgi/Makefile.frag b/third_party/php8.1-src/sapi/cgi/Makefile.frag
index 79e2afe..0956f43 100644
--- a/third_party/php8.1-src/sapi/cgi/Makefile.frag
+++ b/third_party/php8.1-src/sapi/cgi/Makefile.frag
@@ -1,7 +1,7 @@
cgi: $(SAPI_CGI_PATH)
$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_FASTCGI_OBJS) $(PHP_CGI_OBJS)
- $(BUILD_CGI)
+ $(BUILD_CGI) $(WASM_SHARED_LIBS)
install-cgi: $(SAPI_CGI_PATH)
@echo "Installing PHP CGI binary: $(INSTALL_ROOT)$(bindir)/"
diff --git a/third_party/php8.1-src/sapi/cgi/cgi_main.c b/third_party/php8.1-src/sapi/cgi/cgi_main.c
index 499a793..b048346 100644
--- a/third_party/php8.1-src/sapi/cgi/cgi_main.c
+++ b/third_party/php8.1-src/sapi/cgi/cgi_main.c
@@ -18,7 +18,7 @@
| Dmitry Stogov <[email protected]> |
+----------------------------------------------------------------------+
*/
-
+#include <emscripten.h>
#include "php.h"
#include "php_globals.h"
#include "php_variables.h"
@@ -1883,7 +1883,7 @@ int main(int argc, char *argv[])
SG(request_info).path_translated = NULL;
#endif
- cgi_sapi_module.executable_location = argv[0];
+ // cgi_sapi_module.executable_location = argv[0];
if (!cgi && !fastcgi && !bindpath) {
cgi_sapi_module.additional_functions = additional_functions;
}
@@ -1959,8 +1959,10 @@ consult the installation file that came with this distribution, or visit \n\
}
/* make php call us to get _ENV vars */
- php_php_import_environment_variables = php_import_environment_variables;
- php_import_environment_variables = cgi_php_import_environment_variables;
+ if(php_import_environment_variables != cgi_php_import_environment_variables) {
+ php_php_import_environment_variables = php_import_environment_variables;
+ php_import_environment_variables = cgi_php_import_environment_variables;
+ }
if (fastcgi) {
/* How many times to run PHP scripts before dying */
@@ -2665,3 +2667,18 @@ parent_out:
return exit_status;
}
/* }}} */
+
+void EMSCRIPTEN_KEEPALIVE wasm_sapi_cgi_init(void)
+{
+ putenv("USE_ZEND_ALLOC=0");
+}
+
+char* EMSCRIPTEN_KEEPALIVE wasm_sapi_cgi_getenv(char *name)
+{
+ return getenv(name);
+}
+
+char* EMSCRIPTEN_KEEPALIVE wasm_sapi_cgi_putenv(char *name, char *value)
+{
+ return _sapi_cgi_putenv(name, strlen(name), value);
+}
diff --git a/third_party/php8.1-src/sapi/cli/Makefile.frag b/third_party/php8.1-src/sapi/cli/Makefile.frag
index aa1d642..649533d 100644
--- a/third_party/php8.1-src/sapi/cli/Makefile.frag
+++ b/third_party/php8.1-src/sapi/cli/Makefile.frag
@@ -1,7 +1,7 @@
cli: $(SAPI_CLI_PATH)
$(SAPI_CLI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_CLI_OBJS)
- $(BUILD_CLI)
+ $(BUILD_CLI) $(WASM_SHARED_LIBS)
install-cli: $(SAPI_CLI_PATH)
@echo "Installing PHP CLI binary: $(INSTALL_ROOT)$(bindir)/"
diff --git a/third_party/php8.1-src/sapi/embed/php_embed.c b/third_party/php8.1-src/sapi/embed/php_embed.c
index 1679246..2802cfc 100644
--- a/third_party/php8.1-src/sapi/embed/php_embed.c
+++ b/third_party/php8.1-src/sapi/embed/php_embed.c
@@ -246,8 +246,8 @@ EMBED_SAPI_API int php_embed_init(int argc, char **argv)
return FAILURE;
}
- SG(headers_sent) = 1;
- SG(request_info).no_headers = 1;
+ SG(headers_sent) = 0;
+ SG(request_info).no_headers = 0;
php_register_variable("PHP_SELF", "-", NULL);
return SUCCESS;