Skip to content

Commit

Permalink
sync
Browse files Browse the repository at this point in the history
  • Loading branch information
@stefanocasazza
stefanocasazza committed Aug 3, 2012
1 parent 292d5c1 commit 0dd89d4
Show file tree
Hide file tree
Showing 137 changed files with 6,018 additions and 2,150 deletions.
2 changes: 2 additions & 0 deletions Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,7 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
builddir = @builddir@
cpp = @cpp@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
Expand All @@ -311,6 +312,7 @@ libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mcpp = @mcpp@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
Expand Down
2 changes: 1 addition & 1 deletion cdb/buffer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ typedef struct buffer {
} buffer;

#define BUFFER_INIT(op,fd,buf,len) { (buf), 0, (len), (fd), (op) }
#define BUFFER_INSIZE 8192
#define BUFFER_INSIZE 8192
#define BUFFER_OUTSIZE 8192

extern void buffer_init(buffer *,int (*)(),int,char *,unsigned int);
Expand Down
117 changes: 117 additions & 0 deletions configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -624,6 +624,8 @@ ULIB_LIBS
DOXY_FALSE
DOXY_TRUE
DOXYGEN
mcpp
cpp
HUPS_FALSE
HUPS_TRUE
FINAL_FALSE
Expand Down Expand Up @@ -938,6 +940,7 @@ enable_LFS
enable_HIS
enable_HCRS
enable_HUPS
enable_CRPWS
enable_pch
enable_coverage
enable_gcc_optimized
Expand Down Expand Up @@ -1622,6 +1625,7 @@ Optional Features:
--enable-HIS enable HTTP Inotify Support [default=no]
--enable-HCRS enable HTTP Cache Request Support [default=yes]
--enable-HUPS enable HTTP Upload Progress Support [default=no]
--enable-CRPWS enable Client Response Partial Write Support [default=no]
--enable-pch enables precompiled header support (currently only gcc >= 3.4) [default=no]
--enable-coverage enable coverage [default=no]
--enable-gcc-optimized compile with GCC optimizations flags enabled (-finline,-fstrict-aliasing,...) [default=yes]
Expand Down Expand Up @@ -20876,6 +20880,24 @@ $as_echo "#define U_HTTP_UPLOAD_PROGRESS_SUPPORT 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_HUPS" >&5
$as_echo "$enable_HUPS" >&6; }

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if you want to enable client response partial write support" >&5
$as_echo_n "checking if you want to enable client response partial write support... " >&6; }
# Check whether --enable-CRPWS was given.
if test "${enable_CRPWS+set}" = set; then :
enableval=$enable_CRPWS;
fi

if test -z "$enable_CRPWS" ; then
enable_CRPWS="no"
fi
if test "$enable_CRPWS" = "yes"; then

$as_echo "#define U_CLIENT_RESPONSE_PARTIAL_WRITE_SUPPORT 1" >>confdefs.h

fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_CRPWS" >&5
$as_echo "$enable_CRPWS" >&6; }

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if you want to enable use of precompiled headers" >&5
$as_echo_n "checking if you want to enable use of precompiled headers... " >&6; }
# Check whether --enable-pch was given.
Expand Down Expand Up @@ -27596,6 +27618,101 @@ $as_echo "#define HAVE_GNUC_VISIBILTY 1" >>confdefs.h
;;
esac

# cpp

# Extract the first word of "cpp", so it can be a program name with args.
set dummy cpp; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_cpp+:} false; then :
$as_echo_n "(cached) " >&6
else
case $cpp in
[\\/]* | ?:[\\/]*)
ac_cv_path_cpp="$cpp" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_cpp="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS

test -z "$ac_cv_path_cpp" && ac_cv_path_cpp="no"
;;
esac
fi
cpp=$ac_cv_path_cpp
if test -n "$cpp"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cpp" >&5
$as_echo "$cpp" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi


if test "$cpp" != "no"; then

$as_echo "#define HAVE_CPP 1" >>confdefs.h

fi
# Extract the first word of "mcpp", so it can be a program name with args.
set dummy mcpp; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_mcpp+:} false; then :
$as_echo_n "(cached) " >&6
else
case $mcpp in
[\\/]* | ?:[\\/]*)
ac_cv_path_mcpp="$mcpp" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_mcpp="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS

test -z "$ac_cv_path_mcpp" && ac_cv_path_mcpp="no"
;;
esac
fi
mcpp=$ac_cv_path_mcpp
if test -n "$mcpp"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mcpp" >&5
$as_echo "$mcpp" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi


if test "$mcpp" != "no"; then

$as_echo "#define HAVE_MCPP 1" >>confdefs.h

fi

# manuale

# Extract the first word of "doxygen", so it can be a program name with args.
Expand Down
11 changes: 11 additions & 0 deletions configure.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1063,6 +1063,17 @@ case "$target_os" in
;;
esac

# cpp

AC_PATH_PROG( cpp, cpp, no)
if test "$cpp" != "no"; then
AC_DEFINE(HAVE_CPP, 1, [enable cpp preprocessor features])
fi
AC_PATH_PROG(mcpp, mcpp, no)
if test "$mcpp" != "no"; then
AC_DEFINE(HAVE_MCPP, 1, [enable mcpp preprocessor features])
fi

# manuale

AC_PATH_PROG(DOXYGEN, doxygen, no)
Expand Down
2 changes: 2 additions & 0 deletions contrib/HCSP/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,7 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
builddir = @builddir@
cpp = @cpp@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
Expand All @@ -282,6 +283,7 @@ libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mcpp = @mcpp@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
Expand Down
2 changes: 2 additions & 0 deletions contrib/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
builddir = @builddir@
cpp = @cpp@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
Expand All @@ -270,6 +271,7 @@ libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mcpp = @mcpp@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
Expand Down
2 changes: 2 additions & 0 deletions contrib/RSIGN/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
builddir = @builddir@
cpp = @cpp@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
Expand All @@ -260,6 +261,7 @@ libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mcpp = @mcpp@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
Expand Down
2 changes: 2 additions & 0 deletions contrib/signer/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
builddir = @builddir@
cpp = @cpp@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
Expand All @@ -259,6 +260,7 @@ libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mcpp = @mcpp@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
Expand Down
2 changes: 2 additions & 0 deletions doc/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
builddir = @builddir@
cpp = @cpp@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
Expand All @@ -228,6 +229,7 @@ libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mcpp = @mcpp@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
Expand Down
2 changes: 2 additions & 0 deletions examples/IR/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,7 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
builddir = @builddir@
cpp = @cpp@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
Expand All @@ -348,6 +349,7 @@ libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mcpp = @mcpp@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
Expand Down
2 changes: 1 addition & 1 deletion examples/IR/ir_web.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,5 +220,5 @@ extern U_EXPORT int runDynamicPage(UClientImage_Base* client_image);
U_CONSTANT_TO_PARAM(" </div>\n</body>\n</html>")
);

U_RETURN(usp_as_service ? U_NOT_FOUND : 200);
U_RETURN(usp_as_service ? 0 : 200);
} }
2 changes: 2 additions & 0 deletions examples/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
builddir = @builddir@
cpp = @cpp@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
Expand All @@ -278,6 +279,7 @@ libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mcpp = @mcpp@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
Expand Down
2 changes: 2 additions & 0 deletions examples/PEC_log/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,7 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
builddir = @builddir@
cpp = @cpp@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
Expand All @@ -357,6 +358,7 @@ libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mcpp = @mcpp@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
Expand Down
6 changes: 6 additions & 0 deletions examples/WiAuth/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ EXTRA_DIST = wi_auth.cpp wi_auth.usp

ulib_la = $(top_builddir)/src/ulib/lib@ULIB@.la

cdbmake_LDADD = $(top_builddir)/src/ulib/lib@ULIB@.la
cdbmake_SOURCES = cdbmake.cpp
cdbmake_LDFLAGS = $(PRG_LDFLAGS)

bin_PROGRAMS = cdbmake

moduledir = $(libexecdir)/ulib/usp
MODULE_LIBTOOL_OPTIONS = -export-dynamic -avoid-version

Expand Down
Loading

2 comments on commit 0dd89d4

@stefanocasazza
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to restart userver to reload it. In the next days I wish to implement the compilation of usp file at start time as it is done for csp file...

@byzhang
Copy link

@byzhang byzhang commented on 0dd89d4 Feb 1, 2013 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.