diff options
| author | Michael Wallner <mike@php.net> | 2014-07-30 20:14:40 +0200 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2014-07-30 20:14:40 +0200 |
| commit | 03f56152e526c994a8ea6038cc8bb9b1ea8214cb (patch) | |
| tree | 232847cf7f60dce93e240487be135fa38635d6d5 /sapi/milter/php_milter.c | |
| parent | e7d921fd0b433b832542552b871f538d7b6d21f1 (diff) | |
| parent | b3b25e1b7015b5f241dda87ca710350594cf806f (diff) | |
| download | php-git-03f56152e526c994a8ea6038cc8bb9b1ea8214cb.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
BFN
BFN
Fixed bug #67715 (php-milter does not build and crashes randomly).
Diffstat (limited to 'sapi/milter/php_milter.c')
| -rw-r--r-- | sapi/milter/php_milter.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sapi/milter/php_milter.c b/sapi/milter/php_milter.c index e0b2d0a0af..fb4afbc96e 100644 --- a/sapi/milter/php_milter.c +++ b/sapi/milter/php_milter.c @@ -525,6 +525,10 @@ static sfsistat mlfi_close(SMFICTX *ctx) int status; TSRMLS_FETCH(); + if (!SG(sapi_started) && SUCCESS != php_request_startup(TSRMLS_C)) { + return ret; + } + /* call userland */ INIT_ZVAL(function_name); ZVAL_STRING(&function_name, "milter_close", 0); @@ -550,7 +554,7 @@ static sfsistat mlfi_close(SMFICTX *ctx) /* {{{ Milter entry struct */ -struct smfiDesc smfilter = { +static struct smfiDesc smfilter = { "php-milter", /* filter name */ SMFI_VERSION, /* version code -- leave untouched */ 0, /* flags */ @@ -1011,6 +1015,7 @@ int main(int argc, char *argv[]) tsrm_startup(1, 1, 0, NULL); + tsrm_ls = ts_resource(0); sapi_startup(&milter_sapi_module); while ((c=ap_php_getopt(argc, argv, OPTSTRING))!=-1) { @@ -1028,7 +1033,6 @@ int main(int argc, char *argv[]) milter_sapi_module.executable_location = argv[0]; - tsrm_ls = ts_resource(0); sapi_module.startup(&milter_sapi_module); |