summaryrefslogtreecommitdiff
path: root/sapi/milter/php_milter.c
diff options
context:
space:
mode:
Diffstat (limited to 'sapi/milter/php_milter.c')
-rw-r--r--sapi/milter/php_milter.c101
1 files changed, 45 insertions, 56 deletions
diff --git a/sapi/milter/php_milter.c b/sapi/milter/php_milter.c
index d82089ca1f..87df7898a1 100644
--- a/sapi/milter/php_milter.c
+++ b/sapi/milter/php_milter.c
@@ -113,10 +113,9 @@ static int mlfi_init()
zend_file_handle file_handle;
zval function_name, retval;
int status;
- TSRMLS_FETCH();
/* request startup */
- if (php_request_startup(TSRMLS_C)==FAILURE) {
+ if (php_request_startup()==FAILURE) {
SG(headers_sent) = 1;
SG(request_info).no_headers = 1;
php_request_shutdown((void *) 0);
@@ -143,7 +142,7 @@ static int mlfi_init()
file_handle.free_filename = 0;
file_handle.opened_path = NULL;
- php_execute_script(&file_handle TSRMLS_CC);
+ php_execute_script(&file_handle);
/* call userland */
INIT_ZVAL(function_name);
@@ -153,7 +152,7 @@ static int mlfi_init()
/* set the milter context for possible use in API functions */
MG(state) = MLFI_INIT;
- status = call_user_function(CG(function_table), NULL, &function_name, &retval, 0, NULL TSRMLS_CC);
+ status = call_user_function(CG(function_table), NULL, &function_name, &retval, 0, NULL);
MG(state) = MLFI_NONE;
MG(initialized) = 1;
@@ -179,10 +178,9 @@ static sfsistat mlfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr)
zend_file_handle file_handle;
zval function_name, retval, *param[1];
int status;
- TSRMLS_FETCH();
/* request startup */
- if (php_request_startup(TSRMLS_C)==FAILURE) {
+ if (php_request_startup()==FAILURE) {
SG(headers_sent) = 1;
SG(request_info).no_headers = 1;
php_request_shutdown((void *) 0);
@@ -209,7 +207,7 @@ static sfsistat mlfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr)
file_handle.free_filename = 0;
file_handle.opened_path = NULL;
- php_execute_script(&file_handle TSRMLS_CC);
+ php_execute_script(&file_handle);
/* call userland */
INIT_ZVAL(function_name);
@@ -224,7 +222,7 @@ static sfsistat mlfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr)
MG(ctx) = ctx;
MG(state) = MLFI_CONNECT;
- status = call_user_function(CG(function_table), NULL, &function_name, &retval, 1, param TSRMLS_CC);
+ status = call_user_function(CG(function_table), NULL, &function_name, &retval, 1, param);
MG(state) = MLFI_NONE;
zval_ptr_dtor(param);
@@ -243,7 +241,6 @@ static sfsistat mlfi_helo(SMFICTX *ctx, char *helohost)
{
zval function_name, retval, *param[1];
int status;
- TSRMLS_FETCH();
/* call userland */
INIT_ZVAL(function_name);
@@ -258,7 +255,7 @@ static sfsistat mlfi_helo(SMFICTX *ctx, char *helohost)
MG(ctx) = ctx;
MG(state) = MLFI_HELO;
- status = call_user_function(CG(function_table), NULL, &function_name, &retval, 1, param TSRMLS_CC);
+ status = call_user_function(CG(function_table), NULL, &function_name, &retval, 1, param);
MG(state) = MLFI_NONE;
zval_ptr_dtor(param);
@@ -278,7 +275,6 @@ static sfsistat mlfi_envfrom(SMFICTX *ctx, char **argv)
{
zval function_name, retval, *param[1];
int status;
- TSRMLS_FETCH();
/* call userland */
INIT_ZVAL(function_name);
@@ -298,7 +294,7 @@ static sfsistat mlfi_envfrom(SMFICTX *ctx, char **argv)
MG(ctx) = ctx;
MG(state) = MLFI_ENVFROM;
- status = call_user_function(CG(function_table), NULL, &function_name, &retval, 1, param TSRMLS_CC);
+ status = call_user_function(CG(function_table), NULL, &function_name, &retval, 1, param);
MG(state) = MLFI_NONE;
zval_ptr_dtor(param);
@@ -318,7 +314,6 @@ static sfsistat mlfi_envrcpt(SMFICTX *ctx, char **argv)
{
zval function_name, retval, *param[1];
int status;
- TSRMLS_FETCH();
/* call userland */
INIT_ZVAL(function_name);
@@ -338,7 +333,7 @@ static sfsistat mlfi_envrcpt(SMFICTX *ctx, char **argv)
MG(ctx) = ctx;
MG(state) = MLFI_ENVRCPT;
- status = call_user_function(CG(function_table), NULL, &function_name, &retval, 1, param TSRMLS_CC);
+ status = call_user_function(CG(function_table), NULL, &function_name, &retval, 1, param);
MG(state) = MLFI_NONE;
@@ -359,7 +354,6 @@ static sfsistat mlfi_header(SMFICTX *ctx, char *headerf, char *headerv)
{
zval function_name, retval, *param[2];
int status;
- TSRMLS_FETCH();
/* call userland */
INIT_ZVAL(function_name);
@@ -377,7 +371,7 @@ static sfsistat mlfi_header(SMFICTX *ctx, char *headerf, char *headerv)
MG(ctx) = ctx;
MG(state) = MLFI_HEADER;
- status = call_user_function(CG(function_table), NULL, &function_name, &retval, 2, param TSRMLS_CC);
+ status = call_user_function(CG(function_table), NULL, &function_name, &retval, 2, param);
MG(state) = MLFI_NONE;
@@ -399,7 +393,6 @@ static sfsistat mlfi_eoh(SMFICTX *ctx)
{
zval function_name, retval;
int status;
- TSRMLS_FETCH();
/* call userland */
INIT_ZVAL(function_name);
@@ -409,7 +402,7 @@ static sfsistat mlfi_eoh(SMFICTX *ctx)
MG(ctx) = ctx;
MG(state) = MLFI_EOH;
- status = call_user_function(CG(function_table), NULL, &function_name, &retval, 0, NULL TSRMLS_CC);
+ status = call_user_function(CG(function_table), NULL, &function_name, &retval, 0, NULL);
MG(state) = MLFI_NONE;
@@ -428,7 +421,6 @@ static sfsistat mlfi_body(SMFICTX *ctx, u_char *bodyp, size_t len)
{
zval function_name, retval, *param[1];
int status;
- TSRMLS_FETCH();
/* call userland */
INIT_ZVAL(function_name);
@@ -443,7 +435,7 @@ static sfsistat mlfi_body(SMFICTX *ctx, u_char *bodyp, size_t len)
MG(ctx) = ctx;
MG(state) = MLFI_BODY;
- status = call_user_function(CG(function_table), NULL, &function_name, &retval, 1, param TSRMLS_CC);
+ status = call_user_function(CG(function_table), NULL, &function_name, &retval, 1, param);
MG(state) = MLFI_NONE;
@@ -464,7 +456,6 @@ static sfsistat mlfi_eom(SMFICTX *ctx)
{
zval function_name, retval;
int status;
- TSRMLS_FETCH();
/* call userland */
INIT_ZVAL(function_name);
@@ -474,7 +465,7 @@ static sfsistat mlfi_eom(SMFICTX *ctx)
MG(ctx) = ctx;
MG(state) = MLFI_EOM;
- status = call_user_function(CG(function_table), NULL, &function_name, &retval, 0, NULL TSRMLS_CC);
+ status = call_user_function(CG(function_table), NULL, &function_name, &retval, 0, NULL);
MG(state) = MLFI_NONE;
@@ -493,7 +484,6 @@ static sfsistat mlfi_abort(SMFICTX *ctx)
{
zval function_name, retval;
int status;
- TSRMLS_FETCH();
/* call userland */
INIT_ZVAL(function_name);
@@ -503,7 +493,7 @@ static sfsistat mlfi_abort(SMFICTX *ctx)
MG(ctx) = ctx;
MG(state) = MLFI_ABORT;
- status = call_user_function(CG(function_table), NULL, &function_name, &retval, 0, NULL TSRMLS_CC);
+ status = call_user_function(CG(function_table), NULL, &function_name, &retval, 0, NULL);
MG(state) = MLFI_NONE;
@@ -523,9 +513,8 @@ static sfsistat mlfi_close(SMFICTX *ctx)
int ret = SMFIS_CONTINUE;
zval function_name, retval;
int status;
- TSRMLS_FETCH();
- if (!SG(sapi_started) && SUCCESS != php_request_startup(TSRMLS_C)) {
+ if (!SG(sapi_started) && SUCCESS != php_request_startup()) {
return ret;
}
@@ -537,7 +526,7 @@ static sfsistat mlfi_close(SMFICTX *ctx)
MG(ctx) = ctx;
MG(state) = MLFI_CLOSE;
- status = call_user_function(CG(function_table), NULL, &function_name, &retval, 0, NULL TSRMLS_CC);
+ status = call_user_function(CG(function_table), NULL, &function_name, &retval, 0, NULL);
MG(state) = MLFI_NONE;
@@ -582,8 +571,8 @@ PHP_FUNCTION(smfi_setflags)
/* valid only in the init callback */
if (MG(state) != MLFI_INIT) {
- php_error(E_WARNING, NOT_INIT, get_active_function_name(TSRMLS_C));
- } else if (zend_parse_parameters(1 TSRMLS_CC, "l", &flags) == SUCCESS) {
+ php_error(E_WARNING, NOT_INIT, get_active_function_name());
+ } else if (zend_parse_parameters(1, "l", &flags) == SUCCESS) {
flags = flags & (SMFIF_ADDHDRS|SMFIF_CHGHDRS|SMFIF_CHGBODY|SMFIF_ADDRCPT|SMFIF_DELRCPT);
smfilter.xxfi_flags = flags;
}
@@ -598,8 +587,8 @@ PHP_FUNCTION(smfi_settimeout)
/* valid only in the init callback */
if (MG(state) != MLFI_INIT) {
- php_error(E_WARNING, NOT_INIT, get_active_function_name(TSRMLS_C));
- } else if (zend_parse_parameters(1 TSRMLS_CC, "l", &timeout) == SUCCESS) {
+ php_error(E_WARNING, NOT_INIT, get_active_function_name());
+ } else if (zend_parse_parameters(1, "l", &timeout) == SUCCESS) {
smfi_settimeout(timeout);
}
}
@@ -614,8 +603,8 @@ PHP_FUNCTION(smfi_getsymval)
/* valid in any callback */
if (MG(state) == MLFI_NONE) {
- php_error(E_WARNING, IS_NONE, get_active_function_name(TSRMLS_C));
- } else if (zend_parse_parameters(1 TSRMLS_CC, "s", &symname, &len) == SUCCESS) {
+ php_error(E_WARNING, IS_NONE, get_active_function_name());
+ } else if (zend_parse_parameters(1, "s", &symname, &len) == SUCCESS) {
if ((ret = smfi_getsymval(MG(ctx), symname)) != NULL) {
RETURN_STRING(ret, 1);
}
@@ -635,8 +624,8 @@ PHP_FUNCTION(smfi_setreply)
/* valid in any callback */
if (MG(state) == MLFI_NONE) {
- php_error(E_WARNING, IS_NONE, get_active_function_name(TSRMLS_C));
- } else if (zend_parse_parameters(3 TSRMLS_CC, "sss", &rcode, &len, &xcode, &len, &message, &len) == SUCCESS) {
+ php_error(E_WARNING, IS_NONE, get_active_function_name());
+ } else if (zend_parse_parameters(3, "sss", &rcode, &len, &xcode, &len, &message, &len) == SUCCESS) {
if (smfi_setreply(MG(ctx), rcode, xcode, message) == MI_SUCCESS) {
RETURN_TRUE;
}
@@ -655,8 +644,8 @@ PHP_FUNCTION(smfi_addheader)
/* valid only in milter_eom */
if (MG(state) != MLFI_EOM) {
- php_error(E_WARNING, NOT_EOM, get_active_function_name(TSRMLS_C));
- } else if (zend_parse_parameters(2 TSRMLS_CC, "ss", &f, &len, &v, &len) == SUCCESS) {
+ php_error(E_WARNING, NOT_EOM, get_active_function_name());
+ } else if (zend_parse_parameters(2, "ss", &f, &len, &v, &len) == SUCCESS) {
if (smfi_addheader(MG(ctx), f, v) == MI_SUCCESS) {
RETURN_TRUE;
}
@@ -676,8 +665,8 @@ PHP_FUNCTION(smfi_chgheader)
/* valid only in milter_eom */
if (MG(state) != MLFI_EOM) {
- php_error(E_WARNING, NOT_EOM, get_active_function_name(TSRMLS_C));
- } else if (zend_parse_parameters(3 TSRMLS_CC, "sls", &f, &len, &idx, &v, &len) == SUCCESS) {
+ php_error(E_WARNING, NOT_EOM, get_active_function_name());
+ } else if (zend_parse_parameters(3, "sls", &f, &len, &idx, &v, &len) == SUCCESS) {
if (smfi_chgheader(MG(ctx), f, idx, v) == MI_SUCCESS) {
RETURN_TRUE;
}
@@ -696,8 +685,8 @@ PHP_FUNCTION(smfi_addrcpt)
/* valid only in milter_eom */
if (MG(state) != MLFI_EOM) {
- php_error(E_WARNING, NOT_EOM, get_active_function_name(TSRMLS_C));
- } else if (zend_parse_parameters(1 TSRMLS_CC, "s", &rcpt, &len) == SUCCESS) {
+ php_error(E_WARNING, NOT_EOM, get_active_function_name());
+ } else if (zend_parse_parameters(1, "s", &rcpt, &len) == SUCCESS) {
if (smfi_addrcpt(MG(ctx), rcpt) == MI_SUCCESS) {
RETURN_TRUE;
}
@@ -716,8 +705,8 @@ PHP_FUNCTION(smfi_delrcpt)
/* valid only in milter_eom */
if (MG(state) != MLFI_EOM) {
- php_error(E_WARNING, NOT_EOM, get_active_function_name(TSRMLS_C));
- } else if (zend_parse_parameters(1 TSRMLS_CC, "s", &rcpt, &len) == SUCCESS) {
+ php_error(E_WARNING, NOT_EOM, get_active_function_name());
+ } else if (zend_parse_parameters(1, "s", &rcpt, &len) == SUCCESS) {
if (smfi_delrcpt(MG(ctx), rcpt) == MI_SUCCESS) {
RETURN_TRUE;
}
@@ -737,8 +726,8 @@ PHP_FUNCTION(smfi_replacebody)
/* valid only in milter_eom */
if (MG(state) != MLFI_EOM) {
- php_error(E_WARNING, NOT_EOM, get_active_function_name(TSRMLS_C));
- } else if (zend_parse_parameters(1 TSRMLS_CC, "s", &body, &len) == SUCCESS) {
+ php_error(E_WARNING, NOT_EOM, get_active_function_name());
+ } else if (zend_parse_parameters(1, "s", &body, &len) == SUCCESS) {
if (smfi_replacebody(MG(ctx), (u_char*)body, len) == MI_SUCCESS) {
RETURN_TRUE;
}
@@ -859,27 +848,27 @@ static zend_module_entry php_milter_module = {
/* {{{ Milter SAPI
*/
-static int sapi_milter_ub_write(const char *str, uint str_length TSRMLS_DC)
+static int sapi_milter_ub_write(const char *str, uint str_length)
{
return str_length;
}
-static void sapi_milter_register_variables(zval *track_vars_array TSRMLS_DC)
+static void sapi_milter_register_variables(zval *track_vars_array)
{
- php_register_variable ("SERVER_SOFTWARE", "Sendmail Milter", track_vars_array TSRMLS_CC);
+ php_register_variable ("SERVER_SOFTWARE", "Sendmail Milter", track_vars_array);
}
-static int sapi_milter_post_read(char *buf, uint count_bytes TSRMLS_DC)
+static int sapi_milter_post_read(char *buf, uint count_bytes)
{
return 0;
}
-static char* sapi_milter_read_cookies(TSRMLS_D)
+static char* sapi_milter_read_cookies(void)
{
return NULL;
}
-static int sapi_milter_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
+static int sapi_milter_send_headers(sapi_headers_struct *sapi_headers)
{
return SAPI_HEADER_SENT_SUCCESSFULLY;
}
@@ -1099,9 +1088,9 @@ int main(int argc, char *argv[])
break;
case 'v': /* show php version & quit */
- if (php_request_startup(TSRMLS_C)==FAILURE) {
- zend_ini_deactivate(TSRMLS_C);
- php_module_shutdown(TSRMLS_C);
+ if (php_request_startup()==FAILURE) {
+ zend_ini_deactivate();
+ php_module_shutdown();
sapi_shutdown();
tsrm_shutdown();
@@ -1119,7 +1108,7 @@ int main(int argc, char *argv[])
break;
case 'z': /* load extension file */
- zend_load_extension(ap_php_optarg TSRMLS_CC);
+ zend_load_extension(ap_php_optarg);
break;
default:
@@ -1189,7 +1178,7 @@ int main(int argc, char *argv[])
} zend_end_try();
err:
- php_module_shutdown(TSRMLS_C);
+ php_module_shutdown();
sapi_shutdown();
tsrm_shutdown();
View Lorry Controller Status