archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 09:24:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ZTS fixes

Browse source
This commit is contained in:
Thies C. Arntzen 2001-10-26 12:54:55 +00:00
parent c278bfc448
commit ca38506fb7
6 changed files with 48 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ext/rpc/xmlrpc/libxmlrpc/base64.c
View file

@ -14,6 +14,7 @@ static const char rcsid[] = "#(@) $Id$";
/* ENCODE -- Encode binary file into base64. */ /* ENCODE -- Encode binary file into base64. */
#include <stdlib.h> #include <stdlib.h>
#include <ctype.h>
#include "base64.h" #include "base64.h"

18
ext/rpc/xmlrpc/php_xmlrpc.h
View file

@ -93,29 +93,15 @@ PHP_FUNCTION(xmlrpc_server_register_introspection_callback);
for thread safety instead of using true globals. for thread safety instead of using true globals.
*/ */
typedef struct { typedef struct {
/* You can use the next one as type if your module registers any } zend_xmlrpc_globals;
resources. Oh, you can of course rename it to something more
suitable, add list entry types or remove it if it not needed.
It's just an example.
*/
int le_xmlrpc_server;
} php_xmlrpc_globals;
/* In every function that needs to use variables in php_xmlrpc_globals, /* In every function that needs to use variables in zend_xmlrpc_globals,
do call XMLRPCLS_FETCH(); after declaring other variables used by do call XMLRPCLS_FETCH(); after declaring other variables used by
that function, and always refer to them as XMLRPCG(variable). that function, and always refer to them as XMLRPCG(variable).
You are encouraged to rename these macros something shorter, see You are encouraged to rename these macros something shorter, see
examples in any other php module directory. examples in any other php module directory.
*/ */
#ifdef ZTS
#define XMLRPCG(v) (xmlrpc_globals->v)
#define XMLRPCLS_FETCH() php_xmlrpc_globals *xmlrpc_globals = ts_resource(gd_xmlrpc_id)
#else
#define XMLRPCG(v) (xmlrpc_globals.v)
#define XMLRPCLS_FETCH()
#endif
#else #else
#define phpext_xmlrpc_ptr NULL #define phpext_xmlrpc_ptr NULL

35
ext/rpc/xmlrpc/xmlrpc-epi-php.c
View file

@ -64,11 +64,9 @@
gets defined. gets defined.
*/ */
#ifdef ZTS ZEND_DECLARE_MODULE_GLOBALS(xmlrpc)
int xmlrpc_globals_id;
#else static int le_xmlrpc_server;
php_xmlrpc_globals xmlrpc_globals;
#endif
/* Every user visible function must have an entry in xmlrpc_functions[]. /* Every user visible function must have an entry in xmlrpc_functions[].
@ -207,16 +205,18 @@ static void destroy_server_data(xmlrpc_server_data *server) {
/* called when server is being destructed. either when xmlrpc_server_destroy /* called when server is being destructed. either when xmlrpc_server_destroy
* is called, or when request ends. * is called, or when request ends.
*/ */
static void xmlrpc_server_destructor(zend_rsrc_list_entry *rsrc) { static void xmlrpc_server_destructor(zend_rsrc_list_entry *rsrc TSRMLS_DC) {
if(rsrc && rsrc->ptr) { if(rsrc && rsrc->ptr) {
destroy_server_data((xmlrpc_server_data*)rsrc->ptr); destroy_server_data((xmlrpc_server_data*)rsrc->ptr);
} }
} }
static void xmlrpc_init_globals(php_xmlrpc_globals *xmlrpc_globals) /* notneeded
static void xmlrpc_init_globals(zend_xmlrpc_globals *xmlrpc_globals)
{ {
return; return;
} }
*/
/* module init */ /* module init */
PHP_MINIT_FUNCTION(xmlrpc) PHP_MINIT_FUNCTION(xmlrpc)
@ -224,8 +224,11 @@ PHP_MINIT_FUNCTION(xmlrpc)
/* Remove comments if you have entries in php.ini /* Remove comments if you have entries in php.ini
REGISTER_INI_ENTRIES(); REGISTER_INI_ENTRIES();
*/ */
/* notneeded
ZEND_INIT_MODULE_GLOBALS(xmlrpc, xmlrpc_init_globals, NULL); ZEND_INIT_MODULE_GLOBALS(xmlrpc, xmlrpc_init_globals, NULL);
XMLRPCG(le_xmlrpc_server) = zend_register_list_destructors_ex(xmlrpc_server_destructor, NULL, "xmlrpc server", module_number); */
le_xmlrpc_server = zend_register_list_destructors_ex(xmlrpc_server_destructor, NULL, "xmlrpc server", module_number);
return SUCCESS; return SUCCESS;
} }
@ -815,7 +818,7 @@ PHP_FUNCTION(xmlrpc_server_create) {
XMLRPC_ServerRegisterIntrospectionCallback(server->server_ptr, php_xmlrpc_introspection_callback); XMLRPC_ServerRegisterIntrospectionCallback(server->server_ptr, php_xmlrpc_introspection_callback);
/* store for later use */ /* store for later use */
ZEND_REGISTER_RESOURCE(return_value,server, XMLRPCG(le_xmlrpc_server)); ZEND_REGISTER_RESOURCE(return_value,server, le_xmlrpc_server);
} }
} }
} }
@ -836,7 +839,7 @@ PHP_FUNCTION(xmlrpc_server_destroy) {
xmlrpc_server_data *server = zend_list_find(Z_LVAL_P(arg1), &type); xmlrpc_server_data *server = zend_list_find(Z_LVAL_P(arg1), &type);
if(server && type == XMLRPCG(le_xmlrpc_server)) { if(server && type == le_xmlrpc_server) {
bSuccess = zend_list_delete(Z_LVAL_P(arg1)); bSuccess = zend_list_delete(Z_LVAL_P(arg1));
/* called by hashtable destructor /* called by hashtable destructor
@ -868,7 +871,7 @@ static XMLRPC_VALUE php_xmlrpc_callback(XMLRPC_SERVER server, XMLRPC_REQUEST xRe
/* Use same C function for all methods */ /* Use same C function for all methods */
/* php func prototype: function user_func($method_name, $xmlrpc_params, $user_params) */ /* php func prototype: function user_func($method_name, $xmlrpc_params, $user_params) */
call_user_function(CG(function_table), NULL, pData->php_function, pData->return_data, 3, callback_params); call_user_function(CG(function_table), NULL, pData->php_function, pData->return_data, 3, callback_params TSRMLS_CC);
pData->php_executed = 1; pData->php_executed = 1;
} }
@ -896,7 +899,7 @@ static void php_xmlrpc_introspection_callback(XMLRPC_SERVER server, void* data)
/* php func prototype: function string user_func($user_params) */ /* php func prototype: function string user_func($user_params) */
if(call_user_function(CG(function_table), NULL, *php_function, if(call_user_function(CG(function_table), NULL, *php_function,
retval_ptr, 1, callback_params) == SUCCESS) { retval_ptr, 1, callback_params TSRMLS_CC) == SUCCESS) {
XMLRPC_VALUE xData; XMLRPC_VALUE xData;
STRUCT_XMLRPC_ERROR err = {0}; STRUCT_XMLRPC_ERROR err = {0};
@ -954,7 +957,7 @@ PHP_FUNCTION(xmlrpc_server_register_method) {
server = zend_list_find(Z_LVAL_P(handle), &type); server = zend_list_find(Z_LVAL_P(handle), &type);
if(type == XMLRPCG(le_xmlrpc_server)) { if(type == le_xmlrpc_server) {
/* register with C engine. every method just calls our standard callback, /* register with C engine. every method just calls our standard callback,
* and it then dispatches to php as necessary * and it then dispatches to php as necessary
*/ */
@ -989,7 +992,7 @@ PHP_FUNCTION(xmlrpc_server_register_introspection_callback) {
server = zend_list_find(Z_LVAL_P(handle), &type); server = zend_list_find(Z_LVAL_P(handle), &type);
if(type == XMLRPCG(le_xmlrpc_server)) { if(type == le_xmlrpc_server) {
{ {
/* save for later use */ /* save for later use */
MAKE_STD_ZVAL(method_name_save); MAKE_STD_ZVAL(method_name_save);
@ -1041,7 +1044,7 @@ PHP_FUNCTION(xmlrpc_server_call_method) {
server = zend_list_find(Z_LVAL_P(handle), &type); server = zend_list_find(Z_LVAL_P(handle), &type);
if(type == XMLRPCG(le_xmlrpc_server)) { if(type == le_xmlrpc_server) {
/* HACK: use output encoding for now */ /* HACK: use output encoding for now */
input_opts.xml_elem_opts.encoding = utf8_get_encoding_id_from_string(out.xmlrpc_out.xml_elem_opts.encoding); input_opts.xml_elem_opts.encoding = utf8_get_encoding_id_from_string(out.xmlrpc_out.xml_elem_opts.encoding);
@ -1154,7 +1157,7 @@ PHP_FUNCTION(xmlrpc_server_add_introspection_data) {
server = zend_list_find(Z_LVAL_P(handle), &type); server = zend_list_find(Z_LVAL_P(handle), &type);
if (type == XMLRPCG(le_xmlrpc_server)) { if (type == le_xmlrpc_server) {
XMLRPC_VALUE xDesc = PHP_to_XMLRPC(desc); XMLRPC_VALUE xDesc = PHP_to_XMLRPC(desc);
if (xDesc) { if (xDesc) {
int retval = XMLRPC_ServerAddIntrospectionData(server->server_ptr, xDesc); int retval = XMLRPC_ServerAddIntrospectionData(server->server_ptr, xDesc);

1
ext/xmlrpc/libxmlrpc/base64.c
View file

@ -14,6 +14,7 @@ static const char rcsid[] = "#(@) $Id$";
/* ENCODE -- Encode binary file into base64. */ /* ENCODE -- Encode binary file into base64. */
#include <stdlib.h> #include <stdlib.h>
#include <ctype.h>
#include "base64.h" #include "base64.h"

18
ext/xmlrpc/php_xmlrpc.h
View file

@ -93,29 +93,15 @@ PHP_FUNCTION(xmlrpc_server_register_introspection_callback);
for thread safety instead of using true globals. for thread safety instead of using true globals.
*/ */
typedef struct { typedef struct {
/* You can use the next one as type if your module registers any } zend_xmlrpc_globals;
resources. Oh, you can of course rename it to something more
suitable, add list entry types or remove it if it not needed.
It's just an example.
*/
int le_xmlrpc_server;
} php_xmlrpc_globals;
/* In every function that needs to use variables in php_xmlrpc_globals, /* In every function that needs to use variables in zend_xmlrpc_globals,
do call XMLRPCLS_FETCH(); after declaring other variables used by do call XMLRPCLS_FETCH(); after declaring other variables used by
that function, and always refer to them as XMLRPCG(variable). that function, and always refer to them as XMLRPCG(variable).
You are encouraged to rename these macros something shorter, see You are encouraged to rename these macros something shorter, see
examples in any other php module directory. examples in any other php module directory.
*/ */
#ifdef ZTS
#define XMLRPCG(v) (xmlrpc_globals->v)
#define XMLRPCLS_FETCH() php_xmlrpc_globals *xmlrpc_globals = ts_resource(gd_xmlrpc_id)
#else
#define XMLRPCG(v) (xmlrpc_globals.v)
#define XMLRPCLS_FETCH()
#endif
#else #else
#define phpext_xmlrpc_ptr NULL #define phpext_xmlrpc_ptr NULL

35
ext/xmlrpc/xmlrpc-epi-php.c
View file

@ -64,11 +64,9 @@
gets defined. gets defined.
*/ */
#ifdef ZTS ZEND_DECLARE_MODULE_GLOBALS(xmlrpc)
int xmlrpc_globals_id;
#else static int le_xmlrpc_server;
php_xmlrpc_globals xmlrpc_globals;
#endif
/* Every user visible function must have an entry in xmlrpc_functions[]. /* Every user visible function must have an entry in xmlrpc_functions[].
@ -207,16 +205,18 @@ static void destroy_server_data(xmlrpc_server_data *server) {
/* called when server is being destructed. either when xmlrpc_server_destroy /* called when server is being destructed. either when xmlrpc_server_destroy
* is called, or when request ends. * is called, or when request ends.
*/ */
static void xmlrpc_server_destructor(zend_rsrc_list_entry *rsrc) { static void xmlrpc_server_destructor(zend_rsrc_list_entry *rsrc TSRMLS_DC) {
if(rsrc && rsrc->ptr) { if(rsrc && rsrc->ptr) {
destroy_server_data((xmlrpc_server_data*)rsrc->ptr); destroy_server_data((xmlrpc_server_data*)rsrc->ptr);
} }
} }
static void xmlrpc_init_globals(php_xmlrpc_globals *xmlrpc_globals) /* notneeded
static void xmlrpc_init_globals(zend_xmlrpc_globals *xmlrpc_globals)
{ {
return; return;
} }
*/
/* module init */ /* module init */
PHP_MINIT_FUNCTION(xmlrpc) PHP_MINIT_FUNCTION(xmlrpc)
@ -224,8 +224,11 @@ PHP_MINIT_FUNCTION(xmlrpc)
/* Remove comments if you have entries in php.ini /* Remove comments if you have entries in php.ini
REGISTER_INI_ENTRIES(); REGISTER_INI_ENTRIES();
*/ */
/* notneeded
ZEND_INIT_MODULE_GLOBALS(xmlrpc, xmlrpc_init_globals, NULL); ZEND_INIT_MODULE_GLOBALS(xmlrpc, xmlrpc_init_globals, NULL);
XMLRPCG(le_xmlrpc_server) = zend_register_list_destructors_ex(xmlrpc_server_destructor, NULL, "xmlrpc server", module_number); */
le_xmlrpc_server = zend_register_list_destructors_ex(xmlrpc_server_destructor, NULL, "xmlrpc server", module_number);
return SUCCESS; return SUCCESS;
} }
@ -815,7 +818,7 @@ PHP_FUNCTION(xmlrpc_server_create) {
XMLRPC_ServerRegisterIntrospectionCallback(server->server_ptr, php_xmlrpc_introspection_callback); XMLRPC_ServerRegisterIntrospectionCallback(server->server_ptr, php_xmlrpc_introspection_callback);
/* store for later use */ /* store for later use */
ZEND_REGISTER_RESOURCE(return_value,server, XMLRPCG(le_xmlrpc_server)); ZEND_REGISTER_RESOURCE(return_value,server, le_xmlrpc_server);
} }
} }
} }
@ -836,7 +839,7 @@ PHP_FUNCTION(xmlrpc_server_destroy) {
xmlrpc_server_data *server = zend_list_find(Z_LVAL_P(arg1), &type); xmlrpc_server_data *server = zend_list_find(Z_LVAL_P(arg1), &type);
if(server && type == XMLRPCG(le_xmlrpc_server)) { if(server && type == le_xmlrpc_server) {
bSuccess = zend_list_delete(Z_LVAL_P(arg1)); bSuccess = zend_list_delete(Z_LVAL_P(arg1));
/* called by hashtable destructor /* called by hashtable destructor
@ -868,7 +871,7 @@ static XMLRPC_VALUE php_xmlrpc_callback(XMLRPC_SERVER server, XMLRPC_REQUEST xRe
/* Use same C function for all methods */ /* Use same C function for all methods */
/* php func prototype: function user_func($method_name, $xmlrpc_params, $user_params) */ /* php func prototype: function user_func($method_name, $xmlrpc_params, $user_params) */
call_user_function(CG(function_table), NULL, pData->php_function, pData->return_data, 3, callback_params); call_user_function(CG(function_table), NULL, pData->php_function, pData->return_data, 3, callback_params TSRMLS_CC);
pData->php_executed = 1; pData->php_executed = 1;
} }
@ -896,7 +899,7 @@ static void php_xmlrpc_introspection_callback(XMLRPC_SERVER server, void* data)
/* php func prototype: function string user_func($user_params) */ /* php func prototype: function string user_func($user_params) */
if(call_user_function(CG(function_table), NULL, *php_function, if(call_user_function(CG(function_table), NULL, *php_function,
retval_ptr, 1, callback_params) == SUCCESS) { retval_ptr, 1, callback_params TSRMLS_CC) == SUCCESS) {
XMLRPC_VALUE xData; XMLRPC_VALUE xData;
STRUCT_XMLRPC_ERROR err = {0}; STRUCT_XMLRPC_ERROR err = {0};
@ -954,7 +957,7 @@ PHP_FUNCTION(xmlrpc_server_register_method) {
server = zend_list_find(Z_LVAL_P(handle), &type); server = zend_list_find(Z_LVAL_P(handle), &type);
if(type == XMLRPCG(le_xmlrpc_server)) { if(type == le_xmlrpc_server) {
/* register with C engine. every method just calls our standard callback, /* register with C engine. every method just calls our standard callback,
* and it then dispatches to php as necessary * and it then dispatches to php as necessary
*/ */
@ -989,7 +992,7 @@ PHP_FUNCTION(xmlrpc_server_register_introspection_callback) {
server = zend_list_find(Z_LVAL_P(handle), &type); server = zend_list_find(Z_LVAL_P(handle), &type);
if(type == XMLRPCG(le_xmlrpc_server)) { if(type == le_xmlrpc_server) {
{ {
/* save for later use */ /* save for later use */
MAKE_STD_ZVAL(method_name_save); MAKE_STD_ZVAL(method_name_save);
@ -1041,7 +1044,7 @@ PHP_FUNCTION(xmlrpc_server_call_method) {
server = zend_list_find(Z_LVAL_P(handle), &type); server = zend_list_find(Z_LVAL_P(handle), &type);
if(type == XMLRPCG(le_xmlrpc_server)) { if(type == le_xmlrpc_server) {
/* HACK: use output encoding for now */ /* HACK: use output encoding for now */
input_opts.xml_elem_opts.encoding = utf8_get_encoding_id_from_string(out.xmlrpc_out.xml_elem_opts.encoding); input_opts.xml_elem_opts.encoding = utf8_get_encoding_id_from_string(out.xmlrpc_out.xml_elem_opts.encoding);
@ -1154,7 +1157,7 @@ PHP_FUNCTION(xmlrpc_server_add_introspection_data) {
server = zend_list_find(Z_LVAL_P(handle), &type); server = zend_list_find(Z_LVAL_P(handle), &type);
if (type == XMLRPCG(le_xmlrpc_server)) { if (type == le_xmlrpc_server) {
XMLRPC_VALUE xDesc = PHP_to_XMLRPC(desc); XMLRPC_VALUE xDesc = PHP_to_XMLRPC(desc);
if (xDesc) { if (xDesc) {
int retval = XMLRPC_ServerAddIntrospectionData(server->server_ptr, xDesc); int retval = XMLRPC_ServerAddIntrospectionData(server->server_ptr, xDesc);