Skip to content

Commit

Permalink
sync+fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@stefanocasazza
stefanocasazza committed Feb 13, 2017
1 parent 8ab852b commit 96de41f
Show file tree
Hide file tree
Showing 3,064 changed files with 31,424 additions and 875 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 2 additions & 1 deletion Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ ACLOCAL_AMFLAGS = -I m4

EXTRA_DIST = cdb configure.help TODO LICENSE* README* *.spec* \
ULib.m4 rpm.sh rpmpkgreq.lst rpmpkgreq.lst.suse openwrt \
doc/Doxyfile doc/readme.txt shtool *.awk .travis.yml autogen.sh nativejson-benchmark
doc/Doxyfile doc/readme.txt shtool *.awk .travis.yml autogen.sh nativejson-benchmark \
fuzz/http1-corpus fuzz/http2-corpus fuzz/build_libFuzzer.sh fuzz/Makefile.in fuzz/Makefile.am fuzz/uclient_fuzzer.cpp fuzz/uclient.cfg

MAINTAINERCLEANFILES = configure aclocal.m4 libtool Makefile.in Makefile INSTALL

Expand Down
3 changes: 2 additions & 1 deletion Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,8 @@ AUTOMAKE_OPTIONS = no-dependencies ## dist-shar dist-zip
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = cdb configure.help TODO LICENSE* README* *.spec* \
ULib.m4 rpm.sh rpmpkgreq.lst rpmpkgreq.lst.suse openwrt \
doc/Doxyfile doc/readme.txt shtool *.awk .travis.yml autogen.sh nativejson-benchmark
doc/Doxyfile doc/readme.txt shtool *.awk .travis.yml autogen.sh nativejson-benchmark \
fuzz/http1-corpus fuzz/http2-corpus fuzz/build_libFuzzer.sh fuzz/Makefile.in fuzz/Makefile.am fuzz/uclient_fuzzer.cpp fuzz/uclient.cfg

MAINTAINERCLEANFILES = configure aclocal.m4 libtool Makefile.in Makefile INSTALL
moduledir = @ULIB_MODULEDIR@
Expand Down
32 changes: 31 additions & 1 deletion configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -893,6 +893,8 @@ MINGW_FALSE
MINGW_TRUE
LINUX_FALSE
LINUX_TRUE
CLANG_FALSE
CLANG_TRUE
LN_S
am__fastdepCXX_FALSE
am__fastdepCXX_TRUE
Expand Down Expand Up @@ -7696,6 +7698,25 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
$as_echo "$GCC_IS_CLANG" >&6; }
#AC_SUBST(GCC_IS_CLANG)

if false; then
CLANG_TRUE=
CLANG_FALSE='#'
else
CLANG_TRUE='#'
CLANG_FALSE=
fi

if test "$GCC_IS_CLANG" = "yes"; then
if true; then
CLANG_TRUE=
CLANG_FALSE='#'
else
CLANG_TRUE='#'
CLANG_FALSE=
fi

fi

ULIB_LIBS=
MODULE_LIBTOOL_OPTIONS="-shared -export-dynamic -avoid-version"

Expand Down Expand Up @@ -33179,7 +33200,7 @@ See include/ulib/internal/config.h for further configuration information

# SECTION 16: `AC_CONFIG_FILES([FILE...])

ac_config_files="$ac_config_files Makefile rpm.sh ULib.spec m4/Makefile doc/Makefile include/Makefile contrib/Makefile include/ulib/Makefile contrib/HCSP/Makefile contrib/RSIGN/Makefile contrib/signer/Makefile src/ulib/Makefile src/ulib/ULib.rc src/ulib/ULib.pc src/ulib/orm/driver/Makefile src/ulib/net/server/plugin/Makefile src/ulib/net/server/plugin/v8/Makefile src/ulib/net/server/plugin/php/Makefile src/ulib/net/server/plugin/usp/Makefile src/ulib/net/server/plugin/ruby/Makefile src/ulib/net/server/plugin/mod_shib/Makefile src/ulib/net/server/plugin/mod_geoip/Makefile src/ulib/net/server/plugin/usp/usp_compile.sh src/ulib/net/server/plugin/page_speed/Makefile src/ulib/net/server/plugin/python/Makefile examples/Makefile examples/IR/Makefile examples/csp/Makefile examples/lcsp/Makefile examples/rsign/Makefile examples/hello/Makefile examples/WiAuth/Makefile examples/xml2txt/Makefile examples/uclient/Makefile examples/userver/Makefile examples/PEC_log/Makefile examples/workflow/Makefile examples/doc_parse/Makefile examples/lrp_session/Makefile examples/http_header/Makefile examples/test_manager/Makefile examples/doc_classifier/Makefile examples/form_completion/Makefile examples/simple_client_server/Makefile examples/download_accelerator/Makefile examples/XAdES/Makefile examples/XAdES/XAdES.spec examples/xml2txt/xml2txt.spec examples/IR/searchengine-bin.spec examples/lcsp/lcsp.spec examples/lcsp/lcsp_rpc.spec examples/csp/cspclient.spec examples/csp/cspclient_rpc.spec examples/rsign/rsignclient.spec examples/rsign/rsignclient_rpc.spec examples/userver/web_server.spec examples/userver/wagsmserver.spec examples/workflow/workflow.spec examples/PEC_log/PEC_log.spec examples/userver/tsaserver.spec examples/userver/cspserver.spec examples/userver/rsignserver.spec examples/doc_parse/doc_parse.spec tests/Makefile tests/base/Makefile tests/debug/Makefile tests/ulib/Makefile tests/ulib/http2/Makefile tests/examples/Makefile tests/contrib/Makefile"
ac_config_files="$ac_config_files Makefile rpm.sh ULib.spec m4/Makefile doc/Makefile include/Makefile contrib/Makefile include/ulib/Makefile contrib/HCSP/Makefile contrib/RSIGN/Makefile contrib/signer/Makefile fuzz/Makefile src/ulib/Makefile src/ulib/ULib.rc src/ulib/ULib.pc src/ulib/orm/driver/Makefile src/ulib/net/server/plugin/Makefile src/ulib/net/server/plugin/v8/Makefile src/ulib/net/server/plugin/php/Makefile src/ulib/net/server/plugin/usp/Makefile src/ulib/net/server/plugin/ruby/Makefile src/ulib/net/server/plugin/mod_shib/Makefile src/ulib/net/server/plugin/mod_geoip/Makefile src/ulib/net/server/plugin/usp/usp_compile.sh src/ulib/net/server/plugin/page_speed/Makefile src/ulib/net/server/plugin/python/Makefile examples/Makefile examples/IR/Makefile examples/csp/Makefile examples/lcsp/Makefile examples/rsign/Makefile examples/hello/Makefile examples/WiAuth/Makefile examples/xml2txt/Makefile examples/uclient/Makefile examples/userver/Makefile examples/PEC_log/Makefile examples/workflow/Makefile examples/doc_parse/Makefile examples/lrp_session/Makefile examples/http_header/Makefile examples/test_manager/Makefile examples/doc_classifier/Makefile examples/form_completion/Makefile examples/simple_client_server/Makefile examples/download_accelerator/Makefile examples/XAdES/Makefile examples/XAdES/XAdES.spec examples/xml2txt/xml2txt.spec examples/IR/searchengine-bin.spec examples/lcsp/lcsp.spec examples/lcsp/lcsp_rpc.spec examples/csp/cspclient.spec examples/csp/cspclient_rpc.spec examples/rsign/rsignclient.spec examples/rsign/rsignclient_rpc.spec examples/userver/web_server.spec examples/userver/wagsmserver.spec examples/workflow/workflow.spec examples/PEC_log/PEC_log.spec examples/userver/tsaserver.spec examples/userver/cspserver.spec examples/userver/rsignserver.spec examples/doc_parse/doc_parse.spec tests/Makefile tests/base/Makefile tests/debug/Makefile tests/ulib/Makefile tests/ulib/http2/Makefile tests/examples/Makefile tests/contrib/Makefile"


# examples/parser/Makefile \
Expand Down Expand Up @@ -33339,6 +33360,14 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${CLANG_TRUE}" && test -z "${CLANG_FALSE}"; then
as_fn_error $? "conditional \"CLANG\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${CLANG_TRUE}" && test -z "${CLANG_FALSE}"; then
as_fn_error $? "conditional \"CLANG\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${LINUX_TRUE}" && test -z "${LINUX_FALSE}"; then
as_fn_error $? "conditional \"LINUX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
Expand Down Expand Up @@ -35029,6 +35058,7 @@ do
"contrib/HCSP/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/HCSP/Makefile" ;;
"contrib/RSIGN/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/RSIGN/Makefile" ;;
"contrib/signer/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/signer/Makefile" ;;
"fuzz/Makefile") CONFIG_FILES="$CONFIG_FILES fuzz/Makefile" ;;
"src/ulib/Makefile") CONFIG_FILES="$CONFIG_FILES src/ulib/Makefile" ;;
"src/ulib/ULib.rc") CONFIG_FILES="$CONFIG_FILES src/ulib/ULib.rc" ;;
"src/ulib/ULib.pc") CONFIG_FILES="$CONFIG_FILES src/ulib/ULib.pc" ;;
Expand Down
7 changes: 6 additions & 1 deletion configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,11 @@ not clang
AC_MSG_RESULT([$GCC_IS_CLANG])
#AC_SUBST(GCC_IS_CLANG)

AM_CONDITIONAL(CLANG, false)
if test "$GCC_IS_CLANG" = "yes"; then
AM_CONDITIONAL(CLANG, true)
fi

ULIB_LIBS=
MODULE_LIBTOOL_OPTIONS="-shared -export-dynamic -avoid-version"

Expand Down Expand Up @@ -2709,7 +2714,7 @@ See include/ulib/internal/config.h for further configuration information

AC_CONFIG_FILES([
Makefile rpm.sh ULib.spec m4/Makefile doc/Makefile include/Makefile contrib/Makefile
include/ulib/Makefile contrib/HCSP/Makefile contrib/RSIGN/Makefile contrib/signer/Makefile
include/ulib/Makefile contrib/HCSP/Makefile contrib/RSIGN/Makefile contrib/signer/Makefile fuzz/Makefile
src/ulib/Makefile src/ulib/ULib.rc src/ulib/ULib.pc src/ulib/orm/driver/Makefile src/ulib/net/server/plugin/Makefile
src/ulib/net/server/plugin/v8/Makefile src/ulib/net/server/plugin/php/Makefile src/ulib/net/server/plugin/usp/Makefile
src/ulib/net/server/plugin/ruby/Makefile src/ulib/net/server/plugin/mod_shib/Makefile src/ulib/net/server/plugin/mod_geoip/Makefile
Expand Down
2 changes: 1 addition & 1 deletion examples/uclient/uclient.cfg.default
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Parameters {

# CA_PATH ../ulib/CA/CApath
# CA_FILE ../ulib/CA/cacert.pem
# PASSWORD caciucco
# PASSWORD puppamelo
# KEY_FILE ../ulib/CA/username.key
# CERT_FILE ../ulib/CA/username.crt

Expand Down
17 changes: 5 additions & 12 deletions examples/uclient/uclient.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ class Application : public UApplication {
{
U_TRACE(5, "Application::Application()")

client = 0;
follow_redirects = false;
client = 0;
}

~Application()
Expand Down Expand Up @@ -105,13 +104,8 @@ class Application : public UApplication {

client = new UHttpClient<USSLSocket>(&cfg);

user = cfg.at(U_CONSTANT_TO_PARAM("USER"));
password = cfg.at(U_CONSTANT_TO_PARAM("PASSWORD_AUTH"));
follow_redirects = cfg.readBoolean(U_CONSTANT_TO_PARAM("FOLLOW_REDIRECTS"));

client->setFollowRedirects(follow_redirects);
client->getResponseHeader()->setIgnoreCase(true);
client->setRequestPasswordAuthentication(user, password);
client->setFollowRedirects(cfg.readBoolean(U_CONSTANT_TO_PARAM("FOLLOW_REDIRECTS")));
client->setRequestPasswordAuthentication(cfg.at(U_CONSTANT_TO_PARAM("USER")), cfg.at(U_CONSTANT_TO_PARAM("PASSWORD_AUTH")));

UApplication::exit_value = 1;

Expand Down Expand Up @@ -242,10 +236,9 @@ loop: if (upload)
}

private:
UHttpClient<USSLSocket>* client;
UFileConfig cfg;
UString cfg_str, upload, user, password;
bool follow_redirects;
UString cfg_str, upload;
UHttpClient<USSLSocket>* client;

#ifndef U_COVERITY_FALSE_POSITIVE
U_DISALLOW_COPY_AND_ASSIGN(Application)
Expand Down
21 changes: 21 additions & 0 deletions fuzz/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
## Makefile.am for uclient_fuzzer

ulib_la = @ULIBS@ $(top_builddir)/src/ulib/lib@[email protected] @ULIB_LIBS@

DEFAULT_INCLUDES = -I. -I$(top_srcdir)/include

uclient_fuzzer_CC = clang
uclient_fuzzer_CXX = clang++
uclient_fuzzer_CPPFLAGS = -D_GLIBCXX_GCC_GTHR_H
uclient_fuzzer_CFLAGS = -fno-omit-frame-pointer -fsanitize=address -fsanitize-coverage=edge,indirect-calls,8bit-counters
uclient_fuzzer_CXXFLAGS = -fno-omit-frame-pointer -fsanitize=address -fsanitize-coverage=edge,indirect-calls,8bit-counters
uclient_fuzzer_LDFLAGS = -fsanitize=address
uclient_fuzzer_SOURCES = uclient_fuzzer.cpp
uclient_fuzzer_LDADD = $(ulib_la) libFuzzer.a

if CLANG
noinst_PROGRAMS = uclient_fuzzer
endif

clean-local:
-rm -rf core .libs *.bb* *.da *.gc* *.la *.exe gmon.out
Loading

0 comments on commit 96de41f

Please sign in to comment.