forked from oraoto/pib
-
-
Notifications
You must be signed in to change notification settings - Fork 51
/
Copy pathphp8.0.patch
185 lines (171 loc) · 7.34 KB
/
php8.0.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
diff --git a/third_party/php8.0-src/ext/pdo_sqlite/pdo_sqlite.c b/third_party/php8.0-src/ext/pdo_sqlite/pdo_sqlite.c
index 60cd4c3..1aceeed 100644
--- a/third_party/php8.0-src/ext/pdo_sqlite/pdo_sqlite.c
+++ b/third_party/php8.0-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.0-src/ext/pdo_sqlite/sqlite_driver.c b/third_party/php8.0-src/ext/pdo_sqlite/sqlite_driver.c
index 5a72a1e..257bcf5 100644
--- a/third_party/php8.0-src/ext/pdo_sqlite/sqlite_driver.c
+++ b/third_party/php8.0-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.0-src/ext/pdo_sqlite/sqlite_statement.c b/third_party/php8.0-src/ext/pdo_sqlite/sqlite_statement.c
index 3769b1e..7437f1f 100644
--- a/third_party/php8.0-src/ext/pdo_sqlite/sqlite_statement.c
+++ b/third_party/php8.0-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.0-src/ext/phar/Makefile.frag b/third_party/php8.0-src/ext/phar/Makefile.frag
index 58789ca..dd5e6a7 100644
--- a/third_party/php8.0-src/ext/phar/Makefile.frag
+++ b/third_party/php8.0-src/ext/phar/Makefile.frag
@@ -31,13 +31,13 @@ $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc
$(builddir)/phar.php: $(srcdir)/build_precommand.php $(srcdir)/phar/*.inc $(srcdir)/phar/*.php $(SAPI_CLI_PATH)
-@echo "Generating phar.php"
- @$(PHP_PHARCMD_EXECUTABLE) $(PHP_PHARCMD_SETTINGS) $(srcdir)/build_precommand.php > $(builddir)/phar.php
+ -@$(PHP_PHARCMD_EXECUTABLE) $(PHP_PHARCMD_SETTINGS) $(srcdir)/build_precommand.php > $(builddir)/phar.php
$(builddir)/phar.phar: $(builddir)/phar.php $(builddir)/phar/phar.inc $(srcdir)/phar/*.inc $(srcdir)/phar/*.php $(SAPI_CLI_PATH)
-@echo "Generating phar.phar"
-@rm -f $(builddir)/phar.phar
-@rm -f $(srcdir)/phar.phar
- @$(PHP_PHARCMD_EXECUTABLE) $(PHP_PHARCMD_SETTINGS) $(builddir)/phar.php pack -f $(builddir)/phar.phar -a pharcommand -c auto -x \\.svn -p 0 -s $(srcdir)/phar/phar.php -h sha1 -b "$(PHP_PHARCMD_BANG)" $(srcdir)/phar/
+ -@$(PHP_PHARCMD_EXECUTABLE) $(PHP_PHARCMD_SETTINGS) $(builddir)/phar.php pack -f $(builddir)/phar.phar -a pharcommand -c auto -x \\.svn -p 0 -s $(srcdir)/phar/phar.php -h sha1 -b "$(PHP_PHARCMD_BANG)" $(srcdir)/phar/
-@chmod +x $(builddir)/phar.phar
install-pharcmd: pharcmd
diff --git a/third_party/php8.0-src/ext/tokenizer/tokenizer.c b/third_party/php8.0-src/ext/tokenizer/tokenizer.c
index 7567a27..fd155f7 100644
--- a/third_party/php8.0-src/ext/tokenizer/tokenizer.c
+++ b/third_party/php8.0-src/ext/tokenizer/tokenizer.c
@@ -345,7 +345,7 @@ static void add_token(
zend_hash_next_index_insert_new(Z_ARRVAL_P(return_value), &token);
}
-static zend_bool tokenize(zval *return_value, zend_string *source, zend_class_entry *token_class)
+zend_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.0-src/main/fastcgi.c b/third_party/php8.0-src/main/fastcgi.c
index bb9c2b2..c1176df 100644
--- a/third_party/php8.0-src/main/fastcgi.c
+++ b/third_party/php8.0-src/main/fastcgi.c
@@ -558,6 +558,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.0-src/sapi/cgi/cgi_main.c b/third_party/php8.0-src/sapi/cgi/cgi_main.c
index 0d52941..ac46a7a 100644
--- a/third_party/php8.0-src/sapi/cgi/cgi_main.c
+++ b/third_party/php8.0-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 */
@@ -2672,3 +2674,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.0-src/sapi/embed/php_embed.c b/third_party/php8.0-src/sapi/embed/php_embed.c
index b510d51..97cc812 100644
--- a/third_party/php8.0-src/sapi/embed/php_embed.c
+++ b/third_party/php8.0-src/sapi/embed/php_embed.c
@@ -204,8 +204,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;
diff --git a/third_party/php8.0-src/sapi/cgi/Makefile.frag b/third_party/php8.0-src/sapi/cgi/Makefile.frag
index 79e2afe..0956f43 100644
--- a/third_party/php8.0-src/sapi/cgi/Makefile.frag
+++ b/third_party/php8.0-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.0-src/sapi/cli/Makefile.frag b/third_party/php8.0-src/sapi/cli/Makefile.frag
index aa1d642..649533d 100644
--- a/third_party/php8.0-src/sapi/cli/Makefile.frag
+++ b/third_party/php8.0-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)/"