removed sapi/milter

10 files changed, 0 insertions, 1590 deletions

diff --git a/sapi/milter/CREDITS b/sapi/milter/CREDITS
deleted file mode 100644
index cd00d6774b..0000000000
--- a/sapi/milter/CREDITS
+++ /dev/null
@@ -1,2 +0,0 @@
-Sendmail Milter
-Harald Radi
diff --git a/sapi/milter/EXPERIMENTAL b/sapi/milter/EXPERIMENTAL
deleted file mode 100644
index 293159a693..0000000000
--- a/sapi/milter/EXPERIMENTAL
+++ /dev/null
@@ -1,5 +0,0 @@
-this module is experimental,
-its functions may change their names 
-or move to extension all together 
-so do not rely to much on them 
-you have been warned!
diff --git a/sapi/milter/Makefile.frag b/sapi/milter/Makefile.frag
deleted file mode 100644
index f193f56b01..0000000000
--- a/sapi/milter/Makefile.frag
+++ /dev/null
@@ -1,8 +0,0 @@
-milter: $(SAPI_MILTER_PATH)
-
-$(SAPI_MILTER_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_MILTER_OBJS)
-	$(BUILD_MILTER)
-
-install-milter: $(SAPI_MILTER_PATH)
-	@$(INSTALL) -m 0755 $(SAPI_MILTER_PATH) $(INSTALL_ROOT)$(bindir)/php-milter
-
diff --git a/sapi/milter/TODO b/sapi/milter/TODO
deleted file mode 100644
index 4a427ea131..0000000000
--- a/sapi/milter/TODO
+++ /dev/null
@@ -1,5 +0,0 @@
-threaded version still leaks mem, don't know why
-extensions aren't loaded
-stdout to syslog
-testing
-documentation
\ No newline at end of file
diff --git a/sapi/milter/config.m4 b/sapi/milter/config.m4
deleted file mode 100644
index a69ab2e1e7..0000000000
--- a/sapi/milter/config.m4
+++ /dev/null
@@ -1,31 +0,0 @@
-dnl
-dnl $Id$
-dnl
-
-PHP_ARG_WITH(milter, for Milter support,
-[  --with-milter[=DIR]       Build PHP as Milter application], no, no)
-
-if test "$PHP_MILTER" != "no"; then
-  if test "$PHP_MILTER" = "yes"; then
-    if test -f /usr/lib/libmilter.a ; then
-      MILTERPATH=/usr/lib
-    else
-      if test -f /usr/lib/libmilter/libmilter.a ; then
-        MILTERPATH=/usr/lib/libmilter
-      else
-        AC_MSG_ERROR([Unable to find libmilter.a])
-      fi
-    fi
-  else
-    MILTERPATH=$PHP_MILTER
-  fi
-  
-  SAPI_MILTER_PATH=sapi/milter/php-milter
-  PHP_BUILD_THREAD_SAFE
-  PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/milter/Makefile.frag,$abs_srcdir/sapi/milter,sapi/milter)
-  PHP_SELECT_SAPI(milter, program, php_milter.c getopt.c,,'$(SAPI_MILTER_PATH)') 
-  PHP_ADD_LIBRARY_WITH_PATH(milter, $MILTERPATH,)
-  BUILD_MILTER="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_MILTER_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_MILTER_PATH)"
-  PHP_SUBST(SAPI_MILTER_PATH)
-  PHP_SUBST(BUILD_MILTER)
-fi
diff --git a/sapi/milter/getopt.c b/sapi/milter/getopt.c
deleted file mode 100644
index df2c77f94c..0000000000
--- a/sapi/milter/getopt.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/* Borrowed from Apache NT Port */
-
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include <stdlib.h>
-#include "php_getopt.h"
-#define OPTERRCOLON (1)
-#define OPTERRNF (2)
-#define OPTERRARG (3)
-
-
-char *ap_php_optarg;
-int ap_php_optind = 1;
-static int ap_php_opterr = 1;
-
-static int
-ap_php_optiserr(int argc, char * const *argv, int oint, const char *optstr,
-         int optchr, int err)
-{
-    if (ap_php_opterr)
-    {
-        fprintf(stderr, "Error in argument %d, char %d: ", oint, optchr+1);
-        switch(err)
-        {
-        case OPTERRCOLON:
-            fprintf(stderr, ": in flags\n");
-            break;
-        case OPTERRNF:
-            fprintf(stderr, "option not found %c\n", argv[oint][optchr]);
-            break;
-        case OPTERRARG:
-            fprintf(stderr, "no argument for option %c\n", argv[oint][optchr]);
-            break;
-        default:
-            fprintf(stderr, "unknown\n");
-            break;
-        }
-    }
-    return('?');
-}
-
-int ap_php_getopt(int argc, char* const *argv, const char *optstr)
-{
-    static int optchr = 0;
-    static int dash = 0; /* have already seen the - */
-
-    char *cp;
-
-    if (ap_php_optind >= argc)
-        return(EOF);
-    if (!dash && (argv[ap_php_optind][0] !=  '-'))
-        return(EOF);
-    if (!dash && (argv[ap_php_optind][0] ==  '-') && !argv[ap_php_optind][1])
-    {
-        /*
-         * use to specify stdin. Need to let pgm process this and
-         * the following args
-         */
-        return(EOF);
-    }
-    if ((argv[ap_php_optind][0] == '-') && (argv[ap_php_optind][1] == '-'))
-    {
-        /* -- indicates end of args */
-        ap_php_optind++;
-        return(EOF);
-    }
-    if (!dash)
-    {
-        assert((argv[ap_php_optind][0] == '-') && argv[ap_php_optind][1]);
-        dash = 1;
-        optchr = 1;
-    }
-
-    /* Check if the guy tries to do a -: kind of flag */
-    assert(dash);
-    if (argv[ap_php_optind][optchr] == ':')
-    {
-        dash = 0;
-        ap_php_optind++;
-        return(ap_php_optiserr(argc, argv, ap_php_optind-1, optstr, optchr, OPTERRCOLON));
-    }
-    if (!(cp = strchr(optstr, argv[ap_php_optind][optchr])))
-    {
-        int errind = ap_php_optind;
-        int errchr = optchr;
-
-        if (!argv[ap_php_optind][optchr+1])
-        {
-            dash = 0;
-            ap_php_optind++;
-        }
-        else
-            optchr++;
-        return(ap_php_optiserr(argc, argv, errind, optstr, errchr, OPTERRNF));
-    }
-    if (cp[1] == ':')
-    {
-        /* Check for cases where the value of the argument
-           is in the form -<arg> <val> or in the form -<arg><val> */
-        dash = 0;
-        if(!argv[ap_php_optind][2]) {
-            ap_php_optind++;
-            if (ap_php_optind == argc)
-                return(ap_php_optiserr(argc, argv, ap_php_optind-1, optstr, optchr, OPTERRARG));
-            ap_php_optarg = argv[ap_php_optind++];
-        }
-        else
-        {
-            ap_php_optarg = &argv[ap_php_optind][2];
-            ap_php_optind++;
-        }
-        return(*cp);
-    }
-    else
-    {
-        if (!argv[ap_php_optind][optchr+1])
-        {
-            dash = 0;
-            ap_php_optind++;
-        }
-        else
-            optchr++;
-        return(*cp);
-    }
-    assert(0);
-    return(0);	/* never reached */
-}
-
-#ifdef TESTGETOPT
-int
- main (int argc, char **argv)
- {
-      int c;
-      extern char *ap_php_optarg;
-      extern int ap_php_optind;
-      int aflg = 0;
-      int bflg = 0;
-      int errflg = 0;
-      char *ofile = NULL;
-
-      while ((c = ap_php_getopt(argc, argv, "abo:")) != EOF)
-           switch (c) {
-           case 'a':
-                if (bflg)
-                     errflg++;
-                else
-                     aflg++;
-                break;
-           case 'b':
-                if (aflg)
-                     errflg++;
-                else
-                     bflg++;
-                break;
-           case 'o':
-                ofile = ap_php_optarg;
-                (void)printf("ofile = %s\n", ofile);
-                break;
-           case '?':
-                errflg++;
-           }
-      if (errflg) {
-           (void)fprintf(stderr,
-                "usage: cmd [-a|-b] [-o <filename>] files...\n");
-           exit (2);
-      }
-      for ( ; ap_php_optind < argc; ap_php_optind++)
-           (void)printf("%s\n", argv[ap_php_optind]);
-      return 0;
- }
-
-#endif /* TESTGETOPT */
diff --git a/sapi/milter/milter.php b/sapi/milter/milter.php
deleted file mode 100644
index 0878f2a4d9..0000000000
--- a/sapi/milter/milter.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-/**
- * example milter script
- *
- * run: php-milter -D -p /path/to/sock milter.php
- *
- * for details on how to set up sendmail and configure the milter see
- * http://www.sendmail.com/partner/resources/development/milter_api/
- *
- * for api details see
- * http://www.sendmail.com/partner/resources/development/milter_api/api.html
- *
- * below is a list of all callbacks, that are available through the milter sapi,
- * if you leave one or more out they simply won't get called (e.g. if you secify an
- * empty php file, the milter would do nothing :)
- */
-
-/**
- * this function is called once on sapi startup,
- * here you can specify the actions the filter may take
- *
- * see http://www.sendmail.com/partner/resources/development/milter_api/smfi_register.html#flags
- */
-
-function milter_log($msg)
-{
-	$GLOBALS['log'] = fopen("/tmp/milter.log", "a");
-	fwrite($GLOBALS['log'], date("[H:i:s d.m.Y]") . "\t{$msg}\n");
-	fclose($GLOBALS['log']);
-}
-
-function milter_init() {
-	milter_log("-- startup --");
-	milter_log("milter_init()");
-	smfi_setflags(SMFIF_ADDHDRS);
-}
-
-/**
- * is called once, at the start of each SMTP connection
- */
-function milter_connect($connect)
-{
-	milter_log("milter_connect('$connect')");
-}
-
-/**
- * is called whenever the client sends a HELO/EHLO command.
- * It may therefore be called between zero and three times.
- */
-function milter_helo($helo)
-{
-	milter_log("milter_helo('$helo')");
-}
-
-/**
- * is called once at the beginning of each message,
- * before milter_envrcpt.
- */
-function milter_envfrom($args)
-{
-	milter_log("milter_envfrom(args[])");
-	foreach ($args as $ix => $arg) {
-		milter_log("\targs[$ix] = $arg");
-	}
-}
-
-/**
- * is called once per recipient, hence one or more times per message,
- * immediately after milter_envfrom
- */
-function milter_envrcpt($args)
-{
-	milter_log("milter_envrcpt(args[])");
-	foreach ($args as $ix => $arg) {
-		milter_log("\targs[$ix] = $arg");
-	}
-}
-
-/**
- * is called zero or more times between milter_envrcpt and milter_eoh,
- * once per message header
- */
-function milter_header($header, $value)
-{
-	milter_log("milter_header('$header', '$value')");
-}
-
-/**
- * is called once after all headers have been sent and processed.
- */
-function milter_eoh()
-{
-	milter_log("milter_eoh()");
-}
-
-/**
- * is called zero or more times between milter_eoh and milter_eom.
- */
-function milter_body($bodypart)
-{
-	milter_log("milter_body('$bodypart')");
-}
-
-/**
- * is called once after all calls to milter_body for a given message.
- * most of the api functions, that alter the message can only be called
- * within this callback.
- */
-function milter_eom()
-{
-	milter_log("milter_eom()");
-  /* add PHP header to the message */
-  smfi_addheader("X-PHP", phpversion());	
-}
-
-/**
- * may be called at any time during message processing
- * (i.e. between some message-oriented routine and milter_eom).
- */
-function milter_abort()
-{
-	milter_log("milter_abort()");
-}
-
-/**
- * is always called once at the end of each connection.
- */
-function milter_close()
-{
-	milter_log("milter_close()");
-}
-?>
diff --git a/sapi/milter/php_getopt.h b/sapi/milter/php_getopt.h
deleted file mode 100644
index 40da432b59..0000000000
--- a/sapi/milter/php_getopt.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Borrowed from Apache NT Port */
-#include "php.h"
-
-extern char *ap_php_optarg;
-extern int ap_php_optind;
-
-int ap_php_getopt(int argc, char* const *argv, const char *optstr);
diff --git a/sapi/milter/php_milter.c b/sapi/milter/php_milter.c
deleted file mode 100644
index 73a0667326..0000000000
--- a/sapi/milter/php_milter.c
+++ /dev/null
@@ -1,1196 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | PHP Version 7                                                        |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2015 The PHP Group                                |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.01 of the PHP license,      |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_01.txt                                  |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Author: Harald Radi <phanto@php.net>                                 |
-   |         Parts based on CGI SAPI Module by                            |
-   |         Rasmus Lerdorf, Stig Bakken and Zeev Suraski                 |
-   +----------------------------------------------------------------------+
-*/
-
-/* $Id$ */
-
-#include "php.h"
-#include "php_globals.h"
-#include "php_variables.h"
-#include "zend_modules.h"
-
-#ifndef ZTS
-#error SRM sapi module is only useable in thread-safe mode
-#endif
-
-#include "SAPI.h"
-
-#include <stdio.h>
-#include "php.h"
-#if HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#if HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#if HAVE_SIGNAL_H
-#include <signal.h>
-#endif
-#if HAVE_SETLOCALE
-#include <locale.h>
-#endif
-#include "zend.h"
-#include "zend_extensions.h"
-#include "php_ini.h"
-#include "php_globals.h"
-#include "php_main.h"
-#include "fopen_wrappers.h"
-#include "ext/standard/php_standard.h"
-
-#ifdef __riscos__
-#include <unixlib/local.h>
-#endif
-
-#include "zend_compile.h"
-#include "zend_execute.h"
-#include "zend_highlight.h"
-#include "zend_indent.h"
-
-#include "libmilter/mfapi.h"
-
-#include "php_getopt.h"
-
-#define OPTSTRING "ac:d:Def:hnp:vVz:?"
-#define MG(v)  TSRMG(milter_globals_id, zend_milter_globals *, v)
-
-#define IS_NONE "%s(): This function must not be called outside of a milter callback function's scope"
-#define NOT_EOM "%s(): This function can only be used inside the milter_eom callback's scope"
-#define NOT_INIT "%s(): This function can only be used inside the milter_init callback's scope"
-
-#define MLFI_NONE		0
-#define MLFI_CONNECT	1
-#define MLFI_HELO		2
-#define MLFI_ENVFROM	3
-#define MLFI_ENVRCPT	4
-#define MLFI_HEADER		5
-#define MLFI_EOH		6
-#define MLFI_BODY		7
-#define MLFI_EOM		8
-#define MLFI_ABORT		9
-#define MLFI_CLOSE		10
-#define MLFI_INIT		11
-
-/* {{{ globals
- */
-extern char *ap_php_optarg;
-extern int ap_php_optind;
-
-static int flag_debug=0;
-static char *filename = NULL;
-
-/* per thread */
-ZEND_BEGIN_MODULE_GLOBALS(milter)
-	SMFICTX *ctx;
-	int state;
-	int initialized;
-ZEND_END_MODULE_GLOBALS(milter)
-
-ZEND_DECLARE_MODULE_GLOBALS(milter)
-/* }}} */
-
-/* this method is called only once when the milter starts */
-/* {{{ Init Milter
-*/
-static int mlfi_init()
-{
-	int ret = 0;
-	zend_file_handle file_handle;
-	zval function_name, retval;
-	int status;
-
-	/* request startup */
-	if (php_request_startup()==FAILURE) {
-		SG(headers_sent) = 1;
-		SG(request_info).no_headers = 1;
-		php_request_shutdown((void *) 0);
-
-		return -1;
-	}
-
-	/* disable headers */
-	SG(headers_sent) = 1;
-	SG(request_info).no_headers = 1;
-
-	if (filename == NULL) {
-		php_printf("No input file specified");
-		return SMFIS_TEMPFAIL;
-	}
-
-	if (!(file_handle.handle.fp = VCWD_FOPEN(filename, "rb"))) {
-		php_printf("Could not open input file: %s\n", filename);
-		return SMFIS_TEMPFAIL;
-	}
-
-	file_handle.type = ZEND_HANDLE_FP;
-	file_handle.filename = filename;
-	file_handle.free_filename = 0;
-	file_handle.opened_path = NULL;
-
-	php_execute_script(&file_handle);
-
-	/* call userland */
-	INIT_ZVAL(function_name);
-
-	ZVAL_STRING(&function_name, "milter_init", 0);
-
-	/* 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);
-
-	MG(state) = MLFI_NONE;
-	MG(initialized) = 1;
-
-	if (status == SUCCESS && Z_TYPE(retval) == IS_LONG) {
-		ret = Z_LVAL(retval);
-	}
-
-	php_request_shutdown((void *) 0);
-
-	return ret;
-}
-/* }}} */
-
-/* {{{ Milter callback functions
- */
-
-/* connection info filter, is called whenever sendmail connects to the milter */
-/* {{{ mlfi_connect()
-*/
-static sfsistat	mlfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr)
-{
-	zend_file_handle file_handle;
-	zval function_name, retval, *param[1];
-	int status;
-
-	/* request startup */
-	if (php_request_startup()==FAILURE) {
-		SG(headers_sent) = 1;
-		SG(request_info).no_headers = 1;
-		php_request_shutdown((void *) 0);
-
-		return SMFIS_TEMPFAIL;
-	}
-
-	/* disable headers */
-	SG(headers_sent) = 1;
-	SG(request_info).no_headers = 1;
-
-	if (filename == NULL) {
-		php_printf("No input file specified");
-		return SMFIS_TEMPFAIL;
-	}
-
-	if (!(file_handle.handle.fp = VCWD_FOPEN(filename, "rb"))) {
-		php_printf("Could not open input file: %s\n", filename);
-		return SMFIS_TEMPFAIL;
-	}
-
-	file_handle.type = ZEND_HANDLE_FP;
-	file_handle.filename = filename;
-	file_handle.free_filename = 0;
-	file_handle.opened_path = NULL;
-
-	php_execute_script(&file_handle);
-
-	/* call userland */
-	INIT_ZVAL(function_name);
-
-	ALLOC_ZVAL(param[0]);
-	INIT_PZVAL(param[0]);
-
-	ZVAL_STRING(&function_name, "milter_connect", 0);
-	ZVAL_STRING(param[0], hostname, 1);
-
-	/* set the milter context for possible use in API functions */
-	MG(ctx) = ctx;
-	MG(state) = MLFI_CONNECT;
-
-	status = call_user_function(CG(function_table), NULL, &function_name, &retval, 1, param);
-
-	MG(state) = MLFI_NONE;
-	zval_ptr_dtor(param);
-	if (status == SUCCESS && Z_TYPE(retval) == IS_LONG) {
-		return Z_LVAL(retval);
-	}
-
-	return SMFIS_CONTINUE;
-}
-/* }}} */
-
-/* SMTP HELO command filter */
-/* {{{ mlfi_helo()
-*/
-static sfsistat mlfi_helo(SMFICTX *ctx, char *helohost)
-{
-	zval function_name, retval, *param[1];
-	int status;
-
-	/* call userland */
-	INIT_ZVAL(function_name);
-
-	ALLOC_ZVAL(param[0]);
-	INIT_PZVAL(param[0]);
-
-	ZVAL_STRING(&function_name, "milter_helo", 0);
-	ZVAL_STRING(param[0], helohost, 1);
-
-	/* set the milter context for possible use in API functions */
-	MG(ctx) = ctx;
-	MG(state) = MLFI_HELO;
-
-	status = call_user_function(CG(function_table), NULL, &function_name, &retval, 1, param);
-
-	MG(state) = MLFI_NONE;
-	zval_ptr_dtor(param);
-
-	if (status == SUCCESS && Z_TYPE(retval) == IS_LONG) {
-		return Z_LVAL(retval);
-	}
-
-	return SMFIS_CONTINUE;
-}
-/* }}} */
-
-/* envelope sender filter */
-/* {{{ mlfi_envform()
-*/
-static sfsistat mlfi_envfrom(SMFICTX *ctx, char **argv)
-{
-	zval function_name, retval, *param[1];
-	int status;
-
-	/* call userland */
-	INIT_ZVAL(function_name);
-
-	ALLOC_ZVAL(param[0]);
-	INIT_PZVAL(param[0]);
-
-	ZVAL_STRING(&function_name, "milter_envfrom", 0);
-	array_init(param[0]);
-
-	while (*argv) {
-		add_next_index_string(param[0], *argv);
-		argv++;
-	}
-
-	/* set the milter context for possible use in API functions */
-	MG(ctx) = ctx;
-	MG(state) = MLFI_ENVFROM;
-
-	status = call_user_function(CG(function_table), NULL, &function_name, &retval, 1, param);
-
-	MG(state) = MLFI_NONE;
-	zval_ptr_dtor(param);
-
-	if (status == SUCCESS && Z_TYPE(retval) == IS_LONG) {
-		return Z_LVAL(retval);
-	}
-
-	return SMFIS_CONTINUE;
-}
-/* }}} */
-
-/* envelope recipient filter */
-/* {{{ mlfi_envrcpt()
-*/
-static sfsistat mlfi_envrcpt(SMFICTX *ctx, char **argv)
-{
-	zval function_name, retval, *param[1];
-	int status;
-
-	/* call userland */
-	INIT_ZVAL(function_name);
-
-	ALLOC_ZVAL(param[0]);
-	INIT_PZVAL(param[0]);
-
-	ZVAL_STRING(&function_name, "milter_envrcpt", 0);
-	array_init(param[0]);
-
-	while (*argv) {
-		add_next_index_string(param[0], *argv);
-		argv++;
-	}
-
-	/* set the milter context for possible use in API functions */
-	MG(ctx) = ctx;
-	MG(state) = MLFI_ENVRCPT;
-
-	status = call_user_function(CG(function_table), NULL, &function_name, &retval, 1, param);
-
-	MG(state) = MLFI_NONE;
-
-	zval_ptr_dtor(param);
-
-	if (status == SUCCESS && Z_TYPE(retval) == IS_LONG) {
-		return Z_LVAL(retval);
-	}
-
-	return SMFIS_CONTINUE;
-}
-/* }}} */
-
-/* header filter */
-/* {{{ mlfi_header()
-*/
-static sfsistat mlfi_header(SMFICTX *ctx, char *headerf, char *headerv)
-{
-	zval function_name, retval, *param[2];
-	int status;
-
-	/* call userland */
-	INIT_ZVAL(function_name);
-
-	ALLOC_ZVAL(param[0]);
-	ALLOC_ZVAL(param[1]);
-	INIT_PZVAL(param[0]);
-	INIT_PZVAL(param[1]);
-
-	ZVAL_STRING(&function_name, "milter_header", 0);
-	ZVAL_STRING(param[0], headerf, 1);
-	ZVAL_STRING(param[1], headerv, 1);
-
-	/* set the milter context for possible use in API functions */
-	MG(ctx) = ctx;
-	MG(state) = MLFI_HEADER;
-
-	status = call_user_function(CG(function_table), NULL, &function_name, &retval, 2, param);
-
-	MG(state) = MLFI_NONE;
-
-	zval_ptr_dtor(&param[0]);
-	zval_ptr_dtor(&param[1]);
-
-	if (status == SUCCESS && Z_TYPE(retval) == IS_LONG) {
-		return Z_LVAL(retval);
-	}
-
-	return SMFIS_CONTINUE;
-}
-/* }}} */
-
-/* end of header */
-/* {{{ mlfi_eoh()
-*/
-static sfsistat mlfi_eoh(SMFICTX *ctx)
-{
-	zval function_name, retval;
-	int status;
-
-	/* call userland */
-	INIT_ZVAL(function_name);
-	ZVAL_STRING(&function_name, "milter_eoh", 0);
-
-	/* set the milter context for possible use in API functions */
-	MG(ctx) = ctx;
-	MG(state) = MLFI_EOH;
-
-	status = call_user_function(CG(function_table), NULL, &function_name, &retval, 0, NULL);
-
-	MG(state) = MLFI_NONE;
-
-	if (status == SUCCESS && Z_TYPE(retval) == IS_LONG) {
-		return Z_LVAL(retval);
-	}
-
-	return SMFIS_CONTINUE;
-}
-/* }}} */
-
-/* body block */
-/* {{{ mlfi_body()
-*/
-static sfsistat mlfi_body(SMFICTX *ctx, u_char *bodyp, size_t len)
-{
-	zval function_name, retval, *param[1];
-	int status;
-
-	/* call userland */
-	INIT_ZVAL(function_name);
-
-	ALLOC_ZVAL(param[0]);
-	INIT_PZVAL(param[0]);
-
-	ZVAL_STRING(&function_name, "milter_body", 0);
-	ZVAL_STRINGL(param[0], (char*)bodyp, len, 1); /*alex*/
-
-	/* set the milter context for possible use in API functions */
-	MG(ctx) = ctx;
-	MG(state) = MLFI_BODY;
-
-	status = call_user_function(CG(function_table), NULL, &function_name, &retval, 1, param);
-
-	MG(state) = MLFI_NONE;
-
-	zval_ptr_dtor(param);
-
-	if (status == SUCCESS && Z_TYPE(retval) == IS_LONG) {
-		return Z_LVAL(retval);
-	}
-
-	return SMFIS_CONTINUE;
-}
-/* }}} */
-
-/* end of message */
-/* {{{ mlfi_eom()
-*/
-static sfsistat mlfi_eom(SMFICTX *ctx)
-{
-	zval function_name, retval;
-	int status;
-
-	/* call userland */
-	INIT_ZVAL(function_name);
-	ZVAL_STRING(&function_name, "milter_eom", 0);
-
-	/* set the milter context for possible use in API functions */
-	MG(ctx) = ctx;
-	MG(state) = MLFI_EOM;
-
-	status = call_user_function(CG(function_table), NULL, &function_name, &retval, 0, NULL);
-
-	MG(state) = MLFI_NONE;
-
-	if (status == SUCCESS && Z_TYPE(retval) == IS_LONG) {
-		return Z_LVAL(retval);
-	}
-
-	return SMFIS_CONTINUE;
-}
-/* }}} */
-
-/* message aborted */
-/* {{{ mlfi_abort()
-*/
-static sfsistat mlfi_abort(SMFICTX *ctx)
-{
-	zval function_name, retval;
-	int status;
-
-	/* call userland */
-	INIT_ZVAL(function_name);
-	ZVAL_STRING(&function_name, "milter_abort", 0);
-
-	/* set the milter context for possible use in API functions */
-	MG(ctx) = ctx;
-	MG(state) = MLFI_ABORT;
-
-	status = call_user_function(CG(function_table), NULL, &function_name, &retval, 0, NULL);
-
-	MG(state) = MLFI_NONE;
-
-	if (status == SUCCESS && Z_TYPE(retval) == IS_LONG) {
-		return Z_LVAL(retval);
-	}
-
-	return SMFIS_CONTINUE;
-}
-/* }}} */
-
-/* connection cleanup */
-/* {{{ mlfi_close()
-*/
-static sfsistat mlfi_close(SMFICTX *ctx)
-{
-	int ret = SMFIS_CONTINUE;
-	zval function_name, retval;
-	int status;
-
-	if (!SG(sapi_started) && SUCCESS != php_request_startup()) {
-		return ret;
-	}
-
-	/* call userland */
-	INIT_ZVAL(function_name);
-	ZVAL_STRING(&function_name, "milter_close", 0);
-
-	/* set the milter context for possible use in API functions */
-	MG(ctx) = ctx;
-	MG(state) = MLFI_CLOSE;
-
-	status = call_user_function(CG(function_table), NULL, &function_name, &retval, 0, NULL);
-
-	MG(state) = MLFI_NONE;
-
-	if (status == SUCCESS && Z_TYPE(retval) == IS_LONG) {
-		ret = Z_LVAL(retval);
-	}
-
-	php_request_shutdown((void *) 0);
-
-	return ret;
-}
-/* }}} */
-/* }}} */
-
-/* {{{ Milter entry struct
- */
-static struct smfiDesc smfilter = {
-    "php-milter",	/* filter name */
-    SMFI_VERSION,   /* version code -- leave untouched */
-    0,				/* flags */
-    mlfi_connect,	/* info filter callback */
-    mlfi_helo,		/* HELO filter callback */
-    mlfi_envfrom,	/* envelope filter callback */
-    mlfi_envrcpt,	/* envelope recipient filter callback */
-    mlfi_header,	/* header filter callback */
-    mlfi_eoh,		/* end of header callback */
-    mlfi_body,		/* body filter callback */
-    mlfi_eom,		/* end of message callback */
-    mlfi_abort,		/* message aborted callback */
-    mlfi_close,		/* connection cleanup callback */
-};
-/* }}} */
-
-/* {{{ PHP Milter API
- */
-
-/* {{{ proto void smfi_setflags(long flags)
-   Sets the flags describing the actions the filter may take. */
-PHP_FUNCTION(smfi_setflags)
-{
-	long flags;
-
-	/* valid only in the init callback */
-	if (MG(state) != MLFI_INIT) {
-		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;
-	}
-}
-/* }}} */
-
-/* {{{ proto void smfi_settimeout(long timeout)
-   Sets the number of seconds libmilter will wait for an MTA connection before timing out a socket. */
-PHP_FUNCTION(smfi_settimeout)
-{
-	long timeout;
-
-	/* valid only in the init callback */
-	if (MG(state) != MLFI_INIT) {
-		php_error(E_WARNING, NOT_INIT, get_active_function_name());
-	} else if (zend_parse_parameters(1, "l", &timeout) == SUCCESS) {
-		smfi_settimeout(timeout);
-	}
-}
-/* }}} */
-
-/* {{{ proto string smfi_getsymval(string macro)
-   Returns the value of the given macro or NULL if the macro is not defined. */
-PHP_FUNCTION(smfi_getsymval)
-{
-	char *symname, *ret;
-	int len;
-
-	/* valid in any callback */
-	if (MG(state) == MLFI_NONE) {
-		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);
-		}
-	}
-
-	RETURN_NULL();
-}
-/* }}} */
-
-/* {{{ proto bool smfi_setreply(string rcode, string xcode, string message)
-   Directly set the SMTP error reply code for this connection.
-   This code will be used on subsequent error replies resulting from actions taken by this filter. */
-PHP_FUNCTION(smfi_setreply)
-{
-	char *rcode, *xcode, *message;
-	int len;
-
-	/* valid in any callback */
-	if (MG(state) == MLFI_NONE) {
-		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;
-		}
-	}
-
-	RETURN_FALSE;
-}
-/* }}} */
-
-/* {{{ proto bool smfi_addheader(string headerf, string headerv)
-   Adds a header to the current message. */
-PHP_FUNCTION(smfi_addheader)
-{
-	char *f, *v;
-	int len;
-
-	/* valid only in milter_eom */
-	if (MG(state) != MLFI_EOM) {
-		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;
-		}
-	}
-
-	RETURN_FALSE;
-}
-/* }}} */
-
-/* {{{ proto bool smfi_chgheader(string headerf, string headerv)
-   Changes a header's value for the current message. */
-PHP_FUNCTION(smfi_chgheader)
-{
-	char *f, *v;
-	long idx;
-	int len;
-
-	/* valid only in milter_eom */
-	if (MG(state) != MLFI_EOM) {
-		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;
-		}
-	}
-
-	RETURN_FALSE;
-}
-/* }}} */
-
-/* {{{ proto bool smfi_addrcpt(string rcpt)
-   Add a recipient to the message envelope. */
-PHP_FUNCTION(smfi_addrcpt)
-{
-	char *rcpt;
-	int len;
-
-	/* valid only in milter_eom */
-	if (MG(state) != MLFI_EOM) {
-		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;
-		}
-	}
-
-	RETURN_FALSE;
-}
-/* }}} */
-
-/* {{{ proto bool smfi_delrcpt(string rcpt)
-   Removes the named recipient from the current message's envelope. */
-PHP_FUNCTION(smfi_delrcpt)
-{
-	char *rcpt;
-	int len;
-
-	/* valid only in milter_eom */
-	if (MG(state) != MLFI_EOM) {
-		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;
-		}
-	}
-
-	RETURN_FALSE;
-}
-/* }}} */
-
-/* {{{ proto bool smfi_replacebody(string body)
-   Replaces the body of the current message. If called more than once,
-   subsequent calls result in data being appended to the new body. */
-PHP_FUNCTION(smfi_replacebody)
-{
-	char *body;
-	int len;
-
-	/* valid only in milter_eom */
-	if (MG(state) != MLFI_EOM) {
-		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;
-		}
-	}
-
-	RETURN_FALSE;
-}
-/* }}} */
-
-/* {{{ PHP_MINIT_FUNCTION
- */
-PHP_MINIT_FUNCTION(milter)
-{
-	REGISTER_LONG_CONSTANT("SMFIS_CONTINUE",	SMFIS_CONTINUE,	CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("SMFIS_REJECT",		SMFIS_REJECT,	CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("SMFIS_DISCARD",		SMFIS_DISCARD,	CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("SMFIS_ACCEPT",		SMFIS_ACCEPT,	CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("SMFIS_TEMPFAIL",	SMFIS_TEMPFAIL,	CONST_CS | CONST_PERSISTENT);
-
-	REGISTER_LONG_CONSTANT("SMFIF_ADDHDRS",		SMFIF_ADDHDRS,	CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("SMFIF_CHGHDRS",		SMFIF_CHGHDRS,	CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("SMFIF_CHGBODY",		SMFIF_CHGBODY,	CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("SMFIF_ADDRCPT",		SMFIF_ADDRCPT,	CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("SMFIF_DELRCPT",		SMFIF_DELRCPT,	CONST_CS | CONST_PERSISTENT);
-
-	ZEND_INIT_MODULE_GLOBALS(milter, NULL, NULL);
-
-	MG(state) = MLFI_NONE;
-	MG(initialized) = 0;
-	return SUCCESS;
-}
-/* }}} */
-
-/* {{{ PHP_MINFO_FUNCTION
- */
-PHP_MINFO_FUNCTION(milter)
-{
-	php_info_print_table_start();
-	php_info_print_table_header(2, "Milter support", "enabled");
-	php_info_print_table_end();
-}
-/* }}} */
-/* }}} */
-
-/* {{{ arginfo */
-ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_setflags, 0, 0, 1)
-	ZEND_ARG_INFO(0, flags)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_settimeout, 0, 0, 1)
-	ZEND_ARG_INFO(0, timeout)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_getsymval, 0, 0, 1)
-	ZEND_ARG_INFO(0, macro)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_setreply, 0, 0, 3)
-	ZEND_ARG_INFO(0, rcode)
-	ZEND_ARG_INFO(0, xcode)
-	ZEND_ARG_INFO(0, message)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_addheader, 0, 0, 2)
-	ZEND_ARG_INFO(0, headerf)
-	ZEND_ARG_INFO(0, headerv)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_chgheader, 0, 0, 2)
-	ZEND_ARG_INFO(0, headerf)
-	ZEND_ARG_INFO(0, headerv)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_addrcpt, 0, 0, 1)
-	ZEND_ARG_INFO(0, rcpt)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_delrcpt, 0, 0, 1)
-	ZEND_ARG_INFO(0, rcpt)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_smfi_replacebody, 0, 0, 1)
-	ZEND_ARG_INFO(0, body)
-ZEND_END_ARG_INFO()
-/* }}} */
-
-/* {{{ milter_functions[]
-*/
-const static zend_function_entry milter_functions[] = {
-	PHP_FE(smfi_setflags, 		arginfo_smfi_setflags)
-	PHP_FE(smfi_settimeout, 	arginfo_smfi_settimeout)
-	PHP_FE(smfi_getsymval, 		arginfo_smfi_getsymval)
-	PHP_FE(smfi_setreply, 		arginfo_smfi_setreply)
-	PHP_FE(smfi_addheader, 		arginfo_smfi_addheader)
-	PHP_FE(smfi_chgheader, 		arginfo_smfi_chgheader)
-	PHP_FE(smfi_addrcpt, 		arginfo_smfi_addrcpt)
-	PHP_FE(smfi_delrcpt, 		arginfo_smfi_delrcpt)
-	PHP_FE(smfi_replacebody, 	arginfo_smfi_replacebody)
-	PHP_FE_END
-};
-/* }}} */
-
-/* {{{ Zend module entry
-*/
-static zend_module_entry php_milter_module = {
-	STANDARD_MODULE_HEADER,
-	"Milter",
-	milter_functions,
-	PHP_MINIT(milter),
-	NULL,
-	NULL,
-	NULL,
-	PHP_MINFO(milter),
-	"0.1.0",
-	STANDARD_MODULE_PROPERTIES
-};
-/* }}} */
-
-/* {{{ Milter SAPI
-*/
-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)
-{
-	php_register_variable ("SERVER_SOFTWARE", "Sendmail Milter", track_vars_array);
-}
-
-static int sapi_milter_post_read(char *buf, uint count_bytes)
-{
-	return 0;
-}
-
-static char* sapi_milter_read_cookies(void)
-{
-	return NULL;
-}
-
-static int sapi_milter_send_headers(sapi_headers_struct *sapi_headers)
-{
-	return SAPI_HEADER_SENT_SUCCESSFULLY;
-}
-
-static int php_milter_startup(sapi_module_struct *sapi_module)
-{
-	if (php_module_startup(sapi_module, &php_milter_module, 1) == FAILURE) {
-		return FAILURE;
-	}
-	return SUCCESS;
-}
-/* }}} */
-
-/* {{{ sapi_module_struct milter_sapi_module
-*/
-static sapi_module_struct milter_sapi_module = {
-	"milter",						/* name */
-	"Sendmail Milter SAPI",			/* pretty name */
-
-	php_milter_startup,				/* startup */
-	php_module_shutdown_wrapper,	/* shutdown */
-
-	NULL,							/* activate */
-	NULL,							/* deactivate */
-
-	sapi_milter_ub_write,			/* unbuffered write */
-	NULL,							/* flush */
-	NULL,							/* get uid */
-	NULL,							/* getenv */
-
-	php_error,						/* error handler */
-
-	NULL,							/* header handler */
-	sapi_milter_send_headers,		/* send headers handler */
-	NULL,							/* send header handler */
-
-	sapi_milter_post_read,			/* read POST data */
-	sapi_milter_read_cookies,		/* read Cookies */
-
-	sapi_milter_register_variables,	/* register server variables */
-	NULL,							/* Log message */
-	NULL,							/* Get request time */
-	NULL,							/* Child terminate */
-
-	NULL,							/* Block interruptions */
-	NULL,							/* Unblock interruptions */
-
-	STANDARD_SAPI_MODULE_PROPERTIES
-};
-/* }}} */
-
-/****
-* ripped from cli, has to be cleaned up !
-*/
-
-/* {{{ php_milter_usage
-*/
-static void php_milter_usage(char *argv0)
-{
-	char *prog;
-
-	prog = strrchr(argv0, '/');
-	if (prog) {
-		prog++;
-	} else {
-		prog = "php-milter";
-	}
-
-	printf(     "Usage: %s [options] [-f] <file> [args...]\n"
-	            "       %s [options] [-- args...]\n"
-				"  -a               Run interactively\n"
-				"  -c <path>|<file> Look for php.ini file in this directory\n"
-				"  -n               No php.ini file will be used\n"
-				"  -d foo[=bar]     Define INI entry foo with value 'bar'\n"
-				"  -D               run as daemon\n"
-				"  -e               Generate extended information for debugger/profiler\n"
-				"  -f <file>        Parse <file>.\n"
-				"  -h               This help\n"
-				"  -p <socket>      path to create socket\n"
-				"  -v               Version number\n"
-				"  -V <n>           set debug level to n (1 or 2).\n"
-				"  -z <file>        Load Zend extension <file>.\n"
-				"  args...          Arguments passed to script. Use -- args when first argument \n"
-				"                   starts with - or script is read from stdin\n"
-				, prog, prog);
-}
-/* }}} */
-
-static void define_command_line_ini_entry(char *arg) /* {{{ */
-{
-	char *name, *value;
-
-	name = arg;
-	value = strchr(arg, '=');
-	if (value) {
-		*value = 0;
-		value++;
-	} else {
-		value = "1";
-	}
-	zend_alter_ini_entry(name, strlen(name)+1, value, strlen(value), PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);
-}
-/* }}} */
-
-/* {{{ main
-*/
-int main(int argc, char *argv[])
-{
-    char *sock = NULL;
-	int dofork = 0;
-
-	int exit_status = SUCCESS;
-	int c;
-/* temporary locals */
-	int orig_optind=ap_php_optind;
-	char *orig_optarg=ap_php_optarg;
-	int interactive=0;
-	char *param_error=NULL;
-/* end of temporary locals */
-
-	void ***tsrm_ls;
-
-#ifdef HAVE_SIGNAL_H
-#if defined(SIGPIPE) && defined(SIG_IGN)
-	signal(SIGPIPE, SIG_IGN); /* ignore SIGPIPE in standalone mode so
-								that sockets created via fsockopen()
-								don't kill PHP if the remote site
-								closes it.  in apache|apxs mode apache
-								does that for us!  thies@thieso.net
-								20000419 */
-#endif
-#endif
-
-
-	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) {
-		switch (c) {
-		case 'c':
-			milter_sapi_module.php_ini_path_override = strdup(ap_php_optarg);
-			break;
-		case 'n':
-			milter_sapi_module.php_ini_ignore = 1;
-			break;
-		}
-	}
-	ap_php_optind = orig_optind;
-	ap_php_optarg = orig_optarg;
-
-	milter_sapi_module.executable_location = argv[0];
-
-
-	sapi_module.startup(&milter_sapi_module);
-
-	zend_first_try {
-		while ((c=ap_php_getopt(argc, argv, OPTSTRING))!=-1) {
-			switch (c) {
-			case '?':
-				php_output_tearup();
-				SG(headers_sent) = 1;
-				php_milter_usage(argv[0]);
-				php_output_teardown();
-				exit(1);
-				break;
-			}
-		}
-		ap_php_optind = orig_optind;
-		ap_php_optarg = orig_optarg;
-
-        /* Set some CLI defaults */
-		SG(options) |= SAPI_OPTION_NO_CHDIR;
-		zend_alter_ini_entry("html_errors", 12, "0", 1, PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);
-		zend_alter_ini_entry("max_execution_time", 19, "0", 1, PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);
-
-		zend_uv.html_errors = 0; /* tell the engine we're in non-html mode */
-
-		while ((c = ap_php_getopt(argc, argv, OPTSTRING)) != -1) {
-			switch (c) {
-
-			case 'a':	/* interactive mode */
-				printf("Interactive mode enabled\n\n");
-				interactive=1;
-				break;
-
-			case 'C': /* don't chdir to the script directory */
-				/* This is default so NOP */
-				break;
-			case 'd': /* define ini entries on command line */
-				define_command_line_ini_entry(ap_php_optarg);
-				break;
-
-			case 'D': /* daemon */
-				dofork = 1;
-				break;
-
-			case 'e': /* enable extended info output */
-				CG(compiler_options) |= ZEND_COMPILE_EXTENDED_INFO;
-				break;
-
-			case 'f': /* parse file */
-				filename = ap_php_optarg;
-				break;
-
-			case 'h': /* help & quit */
-			case '?':
-				php_output_tearup();
-				SG(headers_sent) = 1;
-				php_milter_usage(argv[0]);
-				php_output_teardown();
-				exit(1);
-				break;
-
-			case 'p': /* socket */
-				sock = strdup(ap_php_optarg);
-				break;
-
-			case 'v': /* show php version & quit */
-				if (php_request_startup()==FAILURE) {
-					zend_ini_deactivate();
-					php_module_shutdown();
-					sapi_shutdown();
-					tsrm_shutdown();
-
-					exit(1);
-				}
-				SG(headers_sent) = 1;
-				SG(request_info).no_headers = 1;
-				php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2015 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
-				php_output_teardown();
-				exit(1);
-				break;
-
-			case 'V': /* verbose */
-				flag_debug = atoi(ap_php_optarg);
-				break;
-
-			case 'z': /* load extension file */
-				zend_load_extension(ap_php_optarg);
-				break;
-
-			default:
-				break;
-			}
-		}
-
-		if (param_error) {
-			SG(headers_sent) = 1;
-			SG(request_info).no_headers = 1;
-			PUTS(param_error);
-			exit(1);
-		}
-
-		/* only set script_file if not set already and not in direct mode and not at end of parameter list */
-		if (argc > ap_php_optind && !filename) {
-			filename=argv[ap_php_optind];
-			ap_php_optind++;
-		}
-
-		/* check if file exists, exit else */
-
-		if (dofork) {
-			switch(fork()) {
-				case -1: /* Uh-oh, we have a problem forking. */
-					fprintf(stderr, "Uh-oh, couldn't fork!\n");
-					exit(errno);
-					break;
-				case 0: /* Child */
-					break;
-				default: /* Parent */
-					exit(0);
-			}
-		}
-
-		if (sock) {
-			struct stat junk;
-			if (stat(sock,&junk) == 0) unlink(sock);
-		}
-
-		openlog("php-milter", LOG_PID, LOG_MAIL);
-
-		if ((exit_status = mlfi_init())) {
-			syslog(1, "mlfi_init failed.");
-			closelog();
-			goto err;
-		}
-
-		smfi_setconn(sock);
-		if (smfi_register(smfilter) == MI_FAILURE) {
-			syslog(1, "smfi_register failed.");
-			fprintf(stderr, "smfi_register failed\n");
-			closelog();
-			goto err;
-		} else {
-			exit_status = smfi_main();
-		}
-
-		closelog();
-
-		if (milter_sapi_module.php_ini_path_override) {
-			free(milter_sapi_module.php_ini_path_override);
-		}
-
-	} zend_catch {
-		exit_status = EG(exit_status);
-	} zend_end_try();
-
-err:
-	php_module_shutdown();
-	sapi_shutdown();
-	tsrm_shutdown();
-
-	exit(exit_status);
-}
-/* }}} */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/sapi/milter/php_milter.h b/sapi/milter/php_milter.h
deleted file mode 100644
index 72d7ac51ee..0000000000
--- a/sapi/milter/php_milter.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef PHP_MILTER_H
-#define PHP_MILTER_H
-
-#include "libmilter/mfapi.h"
-
-#define MLFI_NONE		0
-#define MLFI_CONNECT	1
-#define MLFI_HELO		2
-#define MLFI_ENVFROM	3
-#define MLFI_ENVRCPT	4
-#define MLFI_HEADER		5
-#define MLFI_EOH		6
-#define MLFI_BODY		7
-#define MLFI_EOM		8
-#define MLFI_ABORT		9
-#define MLFI_CLOSE		10
-#define MLFI_INIT		11
-
-#define MG(v)  TSRMG(milter_globals_id, zend_milter_globals *, v)
-
-typedef struct {
-    pthread_t thread;
-	MUTEX_T receiver;
-	MUTEX_T sender;
-	SMFICTX *ctx;
-	sfsistat retval;
-	int message;
-	void **args;
-} worker_thread;
-
-#endif