add missing patch for fpm(cgi)_main.c

tony2001 · tony2001 · commit 4211223ad689 · 2009-12-02T15:05:12.000Z
diff --git a/sapi/fpm/fpm/fastcgi.c b/sapi/fpm/fpm/fastcgi.c
@@ -249,6 +249,11 @@ int fcgi_is_fastcgi(void)
 	}
 }
 
+void fcgi_set_is_fastcgi(int new_value)
+{
+	    is_fastcgi = new_value;
+}
+
 void fcgi_set_in_shutdown(int new_value)
 {
 	in_shutdown = new_value;
@@ -875,7 +880,7 @@ int fcgi_read(fcgi_request *req, char *str, int len)
 	return n;
 }
 
-static inline void fcgi_close(fcgi_request *req, int force, int destroy)
+void fcgi_close(fcgi_request *req, int force, int destroy)
 {
 	if (destroy && req->env) {
 		zend_hash_destroy(req->env);
diff --git a/sapi/fpm/fpm/fastcgi.h b/sapi/fpm/fpm/fastcgi.h
@@ -121,8 +121,10 @@ void fcgi_init_request(fcgi_request *req, int listen_socket);
 int fcgi_accept_request(fcgi_request *req);
 int fcgi_finish_request(fcgi_request *req, int force_close);
 
+void fcgi_set_is_fastcgi(int new_value);
 void fcgi_set_in_shutdown(int);
 void fcgi_set_allowed_clients(char *);
+void fcgi_close(fcgi_request *req, int force, int destroy);
 
 char* fcgi_getenv(fcgi_request *req, const char* var, int var_len);
 char* fcgi_putenv(fcgi_request *req, char* var, int var_len, char* val);
diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c

Original file line number	Diff line number	Diff line change
`@@ -249,6 +249,11 @@ int fcgi_is_fastcgi(void)`
`249`	`249`	`}`
`250`	`250`	`}`
`251`	`251`
	`252`	`+void fcgi_set_is_fastcgi(int new_value)`
	`253`	`+{`
	`254`	`+ is_fastcgi = new_value;`
	`255`	`+}`
	`256`	`+`
`252`	`257`	`void fcgi_set_in_shutdown(int new_value)`
`253`	`258`	`{`
`254`	`259`	`in_shutdown = new_value;`
`@@ -875,7 +880,7 @@ int fcgi_read(fcgi_request req, char str, int len)`
`875`	`880`	`return n;`
`876`	`881`	`}`
`877`	`882`
`878`		`-static inline void fcgi_close(fcgi_request *req, int force, int destroy)`
	`883`	`+void fcgi_close(fcgi_request *req, int force, int destroy)`
`879`	`884`	`{`
`880`	`885`	`if (destroy && req->env) {`
`881`	`886`	`zend_hash_destroy(req->env);`