Skip to content

Commit

Permalink
Check in 1.3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
davidlst committed Aug 20, 2014
1 parent 2efe754 commit c7e5bc2
Show file tree
Hide file tree
Showing 55 changed files with 489 additions and 717 deletions.
72 changes: 72 additions & 0 deletions addon/include/ls.h
Original file line number Diff line number Diff line change
Expand Up @@ -834,6 +834,11 @@ enum lsi_url_op
*/
LSI_URL_REDIRECT_302,

/**
* External redirect with status code 303 See Other.
*/
LSI_URL_REDIRECT_303,

/**
* External redirect with status code 307 Temporary Redirect.
*/
Expand Down Expand Up @@ -2776,6 +2781,59 @@ struct lsi_api_s

time_t ( *get_cur_time )( int32_t *usec );

/**
* @brief get_vhost_count gets the count of Virtual Hosts in the system.
*
* @since 1.0
*
* @return the count of Virtual Hosts.
*/
int ( *get_vhost_count )();

/**
* @brief get_vhost gets a Virtual Host object.
*
* @since 1.0
*
* @param[in] index - the index of the Virtual Host, starting from 0.
* @return a pointer to the Virtual Host object.
*/
const void * ( *get_vhost )( int index );

int (* set_vhost_module_data) ( const void *vhost, const lsi_module_t *pModule, void *data );
void * (* get_Vhost_module_data) ( const void *vhost, const lsi_module_t *pModule );

/**
* @brief handoff_fd return a duplicated file descriptor associated with current session and
* all data received on this file descriptor, including parsed request headers
* and data has not been processed.
* After this function call the server core will stop processing current session and closed
* the original file descriptor. The session object will become invalid.
*
*
* @since 1.0
*
* @param[in] pSession - a pointer to the HttpSession.
* @param[in,out] pData - a pointer to a pointer pointing to the buffer holding data received so far
* The buffer is allocated by server core, must be released by the caller of this function with free().
* @param[in,out] pDataLen - a pointer to the variable receive the size of the buffer.
* @return a file descriptor if success, -1 if failed. the file descriptor is dupped from the original
* file descriptor, it should be closed by the caller of this function when done.
*/
int ( *handoff_fd )( lsi_session_t *pSession, char ** pData, int *pDataLen );



/**
*
* @brief _debugLevel is the level of debugging than server core uses,
* it controls the level of details of debugging messages.
* its range is from 0 to 10, debugging is disabled when set to 0,
* highest level of debug output is used when set to 10.
*
*/
unsigned char _debugLevel;

};


Expand All @@ -2788,6 +2846,20 @@ struct lsi_api_s
*/
extern const lsi_api_t * g_api;

/**
*
* @brief inline function to check if debug logging is enabled or not,
* It should be checked before calling g_api->log() to write a debug log message to
* minimize the cost of debug logging when debug logging was disabled.
*
* @param[in] level the debug logging level, can be in range of 0-9, use 0 to check if debug logging is on or off.
* use 1-9 to check if message at specific level should be logged.
* @return if current debug level is higher (bigger number) than @param level, return 1, otherwise return 0
*
*/
static inline int lsi_isdebug( unsigned int level)
{ return ( g_api->_debugLevel > level ); }


#ifdef __cplusplus
}
Expand Down
20 changes: 10 additions & 10 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for openlitespeed 1.3.3.
# Generated by GNU Autoconf 2.69 for openlitespeed 1.3.4.
#
# Report bugs to <[email protected]>.
#
Expand Down Expand Up @@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='openlitespeed'
PACKAGE_TARNAME='openlitespeed'
PACKAGE_VERSION='1.3.3'
PACKAGE_STRING='openlitespeed 1.3.3'
PACKAGE_VERSION='1.3.4'
PACKAGE_STRING='openlitespeed 1.3.4'
PACKAGE_BUGREPORT='[email protected]'
PACKAGE_URL='http://www.litespeedtech.com/'

Expand Down Expand Up @@ -1357,7 +1357,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures openlitespeed 1.3.3 to adapt to many kinds of systems.
\`configure' configures openlitespeed 1.3.4 to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

Expand Down Expand Up @@ -1427,7 +1427,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of openlitespeed 1.3.3:";;
short | recursive ) echo "Configuration of openlitespeed 1.3.4:";;
esac
cat <<\_ACEOF

Expand Down Expand Up @@ -1562,7 +1562,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
openlitespeed configure 1.3.3
openlitespeed configure 1.3.4
generated by GNU Autoconf 2.69

Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -2236,7 +2236,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.

It was created by openlitespeed $as_me 1.3.3, which was
It was created by openlitespeed $as_me 1.3.4, which was
generated by GNU Autoconf 2.69. Invocation command line was

$ $0 $@
Expand Down Expand Up @@ -3102,7 +3102,7 @@ fi

# Define the identity of the package.
PACKAGE='openlitespeed'
VERSION='1.3.3'
VERSION='1.3.4'


# Some tools Automake needs.
Expand Down Expand Up @@ -18101,7 +18101,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by openlitespeed $as_me 1.3.3, which was
This file was extended by openlitespeed $as_me 1.3.4, which was
generated by GNU Autoconf 2.69. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -18168,7 +18168,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
openlitespeed config.status 1.3.3
openlitespeed config.status 1.3.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ m4_include(ax_lib_expat.m4)

dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69])
AC_INIT([openlitespeed],[1.3.3],[[email protected]],[openlitespeed],[http://www.litespeedtech.com/])
AC_INIT([openlitespeed],[1.3.4],[[email protected]],[openlitespeed],[http://www.litespeedtech.com/])
AM_INIT_AUTOMAKE([1.0 foreign no-define ])

AM_CONFIG_HEADER(src/config.h:src/config.h.in)
Expand Down
123 changes: 0 additions & 123 deletions dist/DEFAULT/conf/vhconf.conf

This file was deleted.

2 changes: 1 addition & 1 deletion dist/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.3.3
1.3.4
Loading

0 comments on commit c7e5bc2

Please sign in to comment.