ultrabug 14/10/27 16:40:14 Added: 2.0.8-threaded-php.patch Log: version bump, drop old (Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key B658FA13)
Revision Changes Path 1.1 www-servers/uwsgi/files/2.0.8-threaded-php.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/uwsgi/files/2.0.8-threaded-php.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/uwsgi/files/2.0.8-threaded-php.patch?rev=1.1&content-type=text/plain Index: 2.0.8-threaded-php.patch =================================================================== --- a/plugins/php/php_plugin.c 2014-10-27 17:23:50.909755436 +0100 +++ b/plugins/php/php_plugin.c 2014-10-27 17:25:24.970534680 +0100 @@ -88,7 +88,7 @@ return str_length; } -static int sapi_uwsgi_send_headers(sapi_headers_struct *sapi_headers) +static int sapi_uwsgi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC) { sapi_header_struct *h; zend_llist_position pos; @@ -146,7 +146,7 @@ } -static char *sapi_uwsgi_read_cookies(void) +static char *sapi_uwsgi_read_cookies(TSRMLS_D) { uint16_t len = 0; struct wsgi_request *wsgi_req = (struct wsgi_request *) SG(server_context); @@ -570,6 +570,10 @@ struct uwsgi_string_list *pset = uphp.set; struct uwsgi_string_list *append_config = uphp.append_config; +#ifdef ZTS + tsrm_startup(1, 1, 0, NULL); +#endif + if (!uphp.sapi_initialized) { sapi_startup(&uwsgi_sapi_module); uphp.sapi_initialized = 1; @@ -678,6 +682,7 @@ zend_file_handle file_handle; + TSRMLS_FETCH(); // fetch the threading state in case PHP is built with threading SG(server_context) = (void *) wsgi_req; if (uwsgi_parse_vars(wsgi_req)) {
