Commit 5e30c637 authored by kelsey's avatar kelsey
Browse files

Further progress based on the v0.1.0 draft.

parent 19aa1f07
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -23,4 +23,3 @@ source code, under the following conditions:
  
The present ETSI Source Code license shall be included in all copies of whole 
or part of this source code and shall not imply any sub-license right.
+3 −0
Original line number Diff line number Diff line
@@ -16,3 +16,6 @@ Bell Communications Research, Inc (Bellcore).
This software contains code derived from the PCRE library pcreposix.c
source code, written by Philip Hazel, Copyright 1997-2004
by the University of Cambridge, England.

This software contains code that is Copyright (c) 2019 Not for Radio,
LLC and subject to the ETSI Software License (see LICENSE).

README.apache

deleted100644 → 0
+0 −110
Original line number Diff line number Diff line

                          Apache HTTP Server

  What is it?
  -----------

  The Apache HTTP Server is a powerful and flexible HTTP/1.1 compliant
  web server.  Originally designed as a replacement for the NCSA HTTP
  Server, it has grown to be the most popular web server on the
  Internet.  As a project of the Apache Software Foundation, the
  developers aim to collaboratively develop and maintain a robust,
  commercial-grade, standards-based server with freely available
  source code.

  The Latest Version
  ------------------

  Details of the latest version can be found on the Apache HTTP
  server project page under http://httpd.apache.org/.

  Documentation
  -------------

  The documentation available as of the date of this release is
  included in HTML format in the docs/manual/ directory.  The most
  up-to-date documentation can be found at
  http://httpd.apache.org/docs/2.4/.

  Installation
  ------------

  Please see the file called INSTALL.  Platform specific notes can be
  found in README.platforms.

  Licensing
  ---------

  Please see the file called LICENSE.

  Cryptographic Software Notice
  -----------------------------

  This distribution may include software that has been designed for use
  with cryptographic software.  The country in which you currently reside
  may have restrictions on the import, possession, use, and/or re-export
  to another country, of encryption software.  BEFORE using any encryption
  software, please check your country's laws, regulations and policies
  concerning the import, possession, or use, and re-export of encryption
  software, to see if this is permitted.  See <http://www.wassenaar.org/>
  for more information.

  The U.S. Government Department of Commerce, Bureau of Industry and
  Security (BIS), has classified this software as Export Commodity 
  Control Number (ECCN) 5D002.C.1, which includes information security
  software using or performing cryptographic functions with asymmetric
  algorithms.  The form and manner of this Apache Software Foundation
  distribution makes it eligible for export under the License Exception
  ENC Technology Software Unrestricted (TSU) exception (see the BIS 
  Export Administration Regulations, Section 740.13) for both object 
  code and source code.

  The following provides more details on the included files that
  may be subject to export controls on cryptographic software:

    Apache httpd 2.0 and later versions include the mod_ssl module under
       modules/ssl/
    for configuring and listening to connections over SSL encrypted
    network sockets by performing calls to a general-purpose encryption
    library, such as OpenSSL or the operating system's platform-specific
    SSL facilities.

    In addition, some versions of apr-util provide an abstract interface
    for symmetrical cryptographic functions that make use of a
    general-purpose encryption library, such as OpenSSL, NSS, or the
    operating system's platform-specific facilities. This interface is
    known as the apr_crypto interface, with implementation beneath the
    /crypto directory. The apr_crypto interface is used by the
    mod_session_crypto module available under
      modules/session
    for optional encryption of session information.

    Some object code distributions of Apache httpd, indicated with the
    word "crypto" in the package name, may include object code for the
    OpenSSL encryption library as distributed in open source form from
    <http://www.openssl.org/source/>.

  The above files are optional and may be removed if the cryptographic
  functionality is not desired or needs to be excluded from redistribution.
  Distribution packages of Apache httpd that include the word "nossl"
  in the package name have been created without the above files and are
  therefore not subject to this notice.

  Contacts
  --------

     o If you want to be informed about new code releases, bug fixes,
       security fixes, general news and information about the Apache server
       subscribe to the apache-announce mailing list as described under
       <http://httpd.apache.org/lists.html#http-announce>

     o If you want freely available support for running Apache please see the
       resources at <http://httpd.apache.org/support.html>

     o If you have a concrete bug report for Apache please see the instructions
       for bug reporting at <http://httpd.apache.org/bug_report.html>

     o If you want to participate in actively developing Apache please
       subscribe to the `dev@httpd.apache.org' mailing list as described at
       <http://httpd.apache.org/lists.html#http-dev>

README.md

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line
# TLMSP httpd demonstrator   

Apache HTTPD modified to support TLMSP (ETSI TS 103 523-2).

## Licensing information

Contributions to this repositories are licensed according to the ETSI
Software License (see LICENSE).

The original implementation of the Apache server is release under the 
Apache license (see LICENSE.apache).
+54 −0
Original line number Diff line number Diff line
@@ -606,6 +606,60 @@ AC_DEFUN([APACHE_CHECK_OPENSSL],[
  fi
])

dnl
dnl APACHE_CHECK_TLMSP_TOOLS
dnl
dnl Configure for tlmsp-tools libraries if
dnl "--with-tlmsp-tools=<path>" was specified.
dnl
AC_DEFUN([APACHE_CHECK_TLMSP_TOOLS],[
  AC_CACHE_CHECK([for tlmsp-tools], [ac_cv_tlmsp_tools], [
    dnl initialise the variables we use
    ac_cv_tlmsp_tools=no
    ap_tlmsp_tools_found=""
    ap_tlmsp_tools_base=""
    ap_tlmsp_tools_libs=""
    ap_tlmsp_tools_mod_cflags=""
    ap_tlmsp_tools_mod_ldflags=""

    dnl Determine the tlmsp-tools base directory, if any
    AC_MSG_CHECKING([for user-provided tlmsp-tools base directory])
    AC_ARG_WITH(tlmsp-tools, APACHE_HELP_STRING(--with-tlmsp-tools=PATH,tlmsp-tools installation directory), [
      dnl If --with-tlmsp-tools specifies a directory, we use that directory
      if test "x$withval" != "xyes" -a "x$withval" != "x"; then
        dnl This ensures $withval is actually a directory and that it is absolute
        ap_tlmsp_tools_base="`cd $withval ; pwd`"
      fi
    ])
    if test "x$ap_tlmsp_tools_base" = "x"; then
      AC_MSG_RESULT(none)
    else
      ac_cv_tlmsp_tools=yes
      AC_MSG_RESULT($ap_tlmsp_tools_base)
      APR_ADDTO(MOD_CFLAGS, [-I$ap_tlmsp_tools_base/include])
      APR_ADDTO(ab_CFLAGS, [-I$ap_tlmsp_tools_base/include])
      APR_ADDTO(MOD_LDFLAGS, [-L$ap_tlmsp_tools_base/lib])
      if test "x$ap_platform_runtime_link_flag" != "x"; then
        APR_ADDTO(MOD_LDFLAGS, [$ap_platform_runtime_link_flag$ap_tlmsp_tools_base/lib])
      fi
      ap_tlmsp_tools_libs="${ap_tlmsp_tools_libs:--ltlmsp-cfg -ltlmsp-util -lucl} `$apr_config --libs`"
      APR_ADDTO(MOD_LDFLAGS, [$ap_tlmsp_tools_libs])
      APR_SETVAR(ab_LIBS, [$MOD_LDFLAGS])
      APACHE_SUBST(ab_CFLAGS)
      APACHE_SUBST(ab_LIBS)

      dnl cache MOD_LDFLAGS, MOD_CFLAGS
      ap_tlmsp_tools_mod_cflags=$MOD_CFLAGS
      ap_tlmsp_tools_mod_ldflags=$MOD_LDFLAGS
    fi
  ])
  if test "x$ac_cv_tlmsp_tools" = "xyes"; then
    AC_DEFINE(HAVE_TLMSP_TOOLS, 1, [Define if tlmsp-tools is available])
    APR_ADDTO(MOD_LDFLAGS, [$ap_tlmsp_tools_mod_ldflags])
    APR_ADDTO(MOD_CFLAGS, [$ap_tlmsp_tools_mod_cflags])
  fi
])

dnl
dnl APACHE_EXPORT_ARGUMENTS
dnl Export (via APACHE_SUBST) the various path-related variables that
Loading