]> granicus.if.org Git - php/commitdiff
removed sapi/phttpd
authorAnatol Belski <ab@php.net>
Tue, 10 Feb 2015 07:38:47 +0000 (08:38 +0100)
committerAnatol Belski <ab@php.net>
Tue, 10 Feb 2015 07:38:47 +0000 (08:38 +0100)
sapi/phttpd/CREDITS [deleted file]
sapi/phttpd/README [deleted file]
sapi/phttpd/config.m4 [deleted file]
sapi/phttpd/php.sym [deleted file]
sapi/phttpd/php_phttpd.h [deleted file]
sapi/phttpd/phttpd.c [deleted file]

diff --git a/sapi/phttpd/CREDITS b/sapi/phttpd/CREDITS
deleted file mode 100644 (file)
index 134cc54..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-phttpd
-Thies C. Arntzen
diff --git a/sapi/phttpd/README b/sapi/phttpd/README
deleted file mode 100644 (file)
index cdb6f7c..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-phttpd sapi module.
-
-THIS IS BY NO MEANS COMPLETE NOR USABLE RIGHT NOW!
-
-thies@thieso.net 03.01.2000
diff --git a/sapi/phttpd/config.m4 b/sapi/phttpd/config.m4
deleted file mode 100644 (file)
index 91339a5..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-dnl
-dnl $Id$
-dnl 
-
-PHP_ARG_WITH(phttpd, for PHTTPD support,
-[  --with-phttpd=DIR       Build PHP as phttpd module], no, no)
-
-if test "$PHP_PHTTPD" != "no"; then
-  if test ! -d $PHP_PHTTPD ; then
-    AC_MSG_ERROR([You did not specify a directory])
-  fi
-  PHP_BUILD_THREAD_SAFE
-  PHP_ADD_INCLUDE($PHP_PHTTPD/include)
-  AC_DEFINE(HAVE_PHTTPD, 1, [Whether you have phttpd])
-  PHP_SELECT_SAPI(phttpd, shared, phttpd.c)
-  INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PHP_PHTTPD/modules/"
-fi
-
-dnl ## Local Variables:
-dnl ## tab-width: 4
-dnl ## End:
diff --git a/sapi/phttpd/php.sym b/sapi/phttpd/php.sym
deleted file mode 100644 (file)
index f10b883..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-pm_init
-pm_exit
-pm_request
-
diff --git a/sapi/phttpd/php_phttpd.h b/sapi/phttpd/php_phttpd.h
deleted file mode 100644 (file)
index af53d18..0000000
+++ /dev/null
@@ -1,24 +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: Thies C. Arntzen <thies@thieso.net>                                                 |
-   +----------------------------------------------------------------------+
-*/
-
-#ifndef PHP_PHTTPD_H
-#define PHP_PHTTPD_H
-
-#include <phttpd.h>
-
-#endif
diff --git a/sapi/phttpd/phttpd.c b/sapi/phttpd/phttpd.c
deleted file mode 100644 (file)
index d47cdc9..0000000
+++ /dev/null
@@ -1,300 +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: Thies C. Arntzen <thies@thieso.net>                                                 |
-   | Based on aolserver SAPI by Sascha Schumann <sascha@schumann.cx>      |
-   +----------------------------------------------------------------------+
-*/
-
-#include "php.h"
-#include "SAPI.h"
-#include "php_main.h"
-
-#ifdef HAVE_PHTTPD
-
-#include "ext/standard/info.h"
-
-#ifndef ZTS
-#error PHTTPD module is only useable in thread-safe mode
-#endif
-
-#include "php_phttpd.h"
-
-typedef struct {
-    struct connectioninfo *cip;
-       struct stat sb;
-} phttpd_globals_struct;
-
-static int ph_globals_id;
-
-#define PHG(v) TSRMG(ph_globals_id, phttpd_globals_struct *, v)
-
-static int
-php_phttpd_startup(sapi_module_struct *sapi_module)
-{
-       fprintf(stderr,"***php_phttpd_startup\n");
-
-    if (php_module_startup(sapi_module, NULL, 0)) {
-        return FAILURE;
-    } else {
-        return SUCCESS;
-    }
-}
-
-static int
-php_phttpd_sapi_ub_write(const char *str, uint str_length)
-{
-    int sent_bytes;
-
-       sent_bytes = fd_write(PHG(cip)->fd, str, str_length);
-
-       if (sent_bytes == -1) {
-               php_handle_aborted_connection();
-       }
-
-    return sent_bytes;
-}
-
-static int
-php_phttpd_sapi_header_handler(sapi_header_struct *sapi_header, sapi_headers_struct *sapi_headers)
-{
-    char *header_name, *header_content;
-    char *p;
-
-       http_sendheaders(PHG(cip)->fd, PHG(cip), SG(sapi_headers).http_response_code, NULL);
-
-    header_name = sapi_header->header;
-    header_content = p = strchr(header_name, ':');
-
-    if (p) {
-        *p = '\0';
-        do {
-            header_content++;
-        } while (*header_content == ' ');
-
-               fd_printf(PHG(cip)->fd,"%s: %s\n", header_name, header_content);
-
-        *p = ':';
-    }
-
-    sapi_free_header(sapi_header);
-
-    return 0;
-}
-
-static int
-php_phttpd_sapi_send_headers(sapi_headers_struct *sapi_headers)
-{
-    if (SG(sapi_headers).send_default_content_type) {
-               fd_printf(PHG(cip)->fd,"Content-Type: text/html\n");
-    }
-
-       fd_putc('\n', PHG(cip)->fd);
-
-    return SAPI_HEADER_SENT_SUCCESSFULLY;
-}
-
-static char *
-php_phttpd_sapi_read_cookies(void)
-{
-
-/*
-    int i;
-    char *http_cookie = NULL;
-
-    i = Ns_SetIFind(NSG(conn->headers), "cookie");
-    if(i != -1) {
-        http_cookie = Ns_SetValue(NSG(conn->headers), i);
-    }
-
-    return http_cookie;
-*/
-       fprintf(stderr,"***php_phttpd_sapi_read_cookies\n");
-
-       return 0;
-}
-
-static int
-php_phttpd_sapi_read_post(char *buf, uint count_bytes)
-{
-/*
-    uint max_read;
-    uint total_read = 0;
-
-    max_read = MIN(NSG(data_avail), count_bytes);
-
-    total_read = Ns_ConnRead(NSG(conn), buf, max_read);
-
-    if(total_read == NS_ERROR) {
-        total_read = -1;
-    } else {
-        NSG(data_avail) -= total_read;
-    }
-
-    return total_read;
-*/
-       fprintf(stderr,"***php_phttpd_sapi_read_post\n");
-       return 0;
-}
-
-static sapi_module_struct phttpd_sapi_module = {
-    "phttpd",
-    "PHTTPD",
-
-    php_phttpd_startup,                     /* startup */
-    php_module_shutdown_wrapper,            /* shutdown */
-
-       NULL,                                                                   /* activate */
-       NULL,                                                                   /* deactivate */
-
-    php_phttpd_sapi_ub_write,               /* unbuffered write */
-       NULL,                                                                   /* flush */
-       NULL,                                                                   /* get uid */
-       NULL,                                                                   /* getenv */
-
-    php_error,                              /* error handler */
-
-    php_phttpd_sapi_header_handler,         /* header handler */
-    php_phttpd_sapi_send_headers,           /* send headers handler */
-    NULL,                                   /* send header handler */
-
-    php_phttpd_sapi_read_post,              /* read POST data */
-    php_phttpd_sapi_read_cookies,           /* read Cookies */
-
-       NULL,                                                                   /* register server variables */
-       NULL,                                                                   /* Log message */
-       NULL,                                                                   /* Get request time */
-       NULL,                                                                   /* Child terminate */
-
-    STANDARD_SAPI_MODULE_PROPERTIES
-};
-
-static void
-php_phttpd_request_ctor(void)
-{
-       memset(&SG(request_info), 0, sizeof(sapi_globals_struct)); /* pfusch! */
-
-    SG(request_info).query_string = PHG(cip)->hip->request;
-    SG(request_info).request_method = PHG(cip)->hip->method;
-       SG(request_info).path_translated = malloc(MAXPATHLEN);
-    SG(sapi_headers).http_response_code = 200;
-       if (url_expand(PHG(cip)->hip->url, SG(request_info).path_translated, MAXPATHLEN, &PHG(sb), NULL, NULL) == NULL) {
-               /* handle error */
-       }
-
-#if 0
-    char *server;
-    Ns_DString ds;
-    char *root;
-    int index;
-    char *tmp;
-
-    server = Ns_ConnServer(NSG(conn));
-
-    Ns_DStringInit(&ds);
-    Ns_UrlToFile(&ds, server, NSG(conn->request->url));
-
-    /* path_translated is the absolute path to the file */
-    SG(request_info).path_translated = strdup(Ns_DStringValue(&ds));
-    Ns_DStringFree(&ds);
-    root = Ns_PageRoot(server);
-    SG(request_info).request_uri = SG(request_info).path_translated + strlen(root);
-    SG(request_info).content_length = Ns_ConnContentLength(NSG(conn));
-    index = Ns_SetIFind(NSG(conn)->headers, "content-type");
-    SG(request_info).content_type = index == -1 ? NULL :
-        Ns_SetValue(NSG(conn)->headers, index);
-
-    tmp = Ns_ConnAuthUser(NSG(conn));
-    if(tmp) {
-        tmp = estrdup(tmp);
-    }
-    SG(request_info).auth_user = tmp;
-
-    tmp = Ns_ConnAuthPasswd(NSG(conn));
-    if(tmp) {
-        tmp = estrdup(tmp);
-    }
-    SG(request_info).auth_password = tmp;
-
-    NSG(data_avail) = SG(request_info).content_length;
-#endif
-}
-
-static void
-php_phttpd_request_dtor(void)
-{
-    free(SG(request_info).path_translated);
-}
-
-
-int php_doit(void)
-{
-       struct stat sb;
-       zend_file_handle file_handle;
-       struct httpinfo *hip = PHG(cip)->hip;
-
-       if (php_request_startup() == FAILURE) {
-        return -1;
-    }
-
-    file_handle.type = ZEND_HANDLE_FILENAME;
-    file_handle.filename = SG(request_info).path_translated;
-    file_handle.free_filename = 0;
-
-/*
-       php_phttpd_hash_environment();
-*/
-       php_execute_script(&file_handle);
-       php_request_shutdown(NULL);
-
-       return SG(sapi_headers).http_response_code;
-}
-
-int pm_init(const char **argv)
-{
-       tsrm_startup(1, 1, 0, NULL);
-       sapi_startup(&phttpd_sapi_module);
-    phttpd_sapi_module.startup(&phttpd_sapi_module);
-
-       ts_allocate_id(&ph_globals_id, sizeof(phttpd_globals_struct), NULL, NULL);
-
-       return 0;
-}
-
-void pm_exit(void)
-{
-       fprintf(stderr,"***pm_exit\n");
-}
-
-int pm_request(struct connectioninfo *cip)
-{
-       struct httpinfo *hip = cip->hip;
-       int status;
-
-       if (strcasecmp(hip->method, "GET") == 0 ||
-           strcasecmp(hip->method, "HEAD") == 0 ||
-           strcasecmp(hip->method, "POST") == 0) {
-               PHG(cip) = cip;
-
-               php_phttpd_request_ctor();
-               status = php_doit();
-               php_phttpd_request_dtor();
-
-               return status;
-       } else {
-               return -2;
-       }
-}
-
-#endif