diff --git a/Makefile.in b/Makefile.in index 9c9d0911..7c96313b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -334,6 +334,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/configure b/configure index bba5efca..9f3992d7 100755 --- a/configure +++ b/configure @@ -928,6 +928,7 @@ CXX PKG_CONFIG CROSS_COMPILING_FALSE CROSS_COMPILING_TRUE +PORTNAME EGREP GREP CPP @@ -5774,6 +5775,48 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +template= +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which template to use" >&5 +$as_echo_n "checking which template to use... " >&6; } + +case $host_os in + linux*|gnu*|k*bsd*-gnu) + template=linux ;; + mingw*) template=win32 ;; + cygwin*) template=cygwin ;; +# aix*) template=aix ;; +# darwin*) template=darwin ;; +#dragonfly*) template=netbsd ;; +# freebsd*) template=freebsd ;; +# hpux*) template=hpux ;; +# netbsd*) template=netbsd ;; +# openbsd*) template=openbsd ;; +# sco*) template=sco ;; +# solaris*) template=solaris ;; +# sysv5*) template=unixware ;; +esac + + if test x"$template" = x"" ; then + as_fn_error $? " +*************************************************************************** +ULib has apparently not been ported to your platform yet. Try a manual +configuration. Please also contact to see about +rectifying this. Include the above 'checking host system type...' line. +*************************************************************************** +" "$LINENO" 5 + fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $template" >&5 +$as_echo "$template" >&6; } + +PORTNAME=$template + + +# +# Read the template +# +# . "$srcdir/src/template/$template" || exit + { $as_echo "$as_me:${as_lineno-$LINENO}: checking initial CXX" >&5 $as_echo_n "checking initial CXX... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 @@ -35200,6 +35243,82 @@ CXX=$CXX_save +# Check if the compiler still works with the final flag settings +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler still works" >&5 +$as_echo_n "checking whether the C compiler still works... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + as_fn_error $? "cannot proceed" "$LINENO" 5 +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +if test "$cross_compiling" != "yes"; then +# This test makes sure that run tests work at all. Sometimes a shared +# library is found by the linker, but the runtime linker can't find it. +# This check should come after all modifications of compiler or linker +# variables, and before any other run tests +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking test program" >&5 +$as_echo_n "checking test program... " >&6; } +if test "$cross_compiling" = yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: cross-compiling" >&5 +$as_echo "cross-compiling" >&6; } +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main() { return 0; } +_ACEOF +if ac_fn_cxx_try_run "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 +$as_echo "failed" >&6; } +as_fn_error $? " +Could not execute a simple test program. This may be a problem +related to locating shared libraries. Check the file 'config.log' +for the exact reason." "$LINENO" 5 +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi + +# Create compiler version string +if test x"$GCC" = x"yes" ; then + cc_string=`${CC} --version | sed q` + case $cc_string in [A-Za-z]*) ;; *) cc_string="GCC $cc_string";; esac +elif test x"$SUN_STUDIO_CC" = x"yes" ; then + cc_string=`${CC} -V 2>&1 | sed q` +else + cc_string=$CC +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: using compiler=$cc_string" >&5 +$as_echo "$as_me: using compiler=$cc_string" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: using CFLAGS=$CFLAGS" >&5 +$as_echo "$as_me: using CFLAGS=$CFLAGS" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: using CPPFLAGS=$CPPFLAGS" >&5 +$as_echo "$as_me: using CPPFLAGS=$CPPFLAGS" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: using LDFLAGS=$LDFLAGS" >&5 +$as_echo "$as_me: using LDFLAGS=$LDFLAGS" >&6;} + cat >>confdefs.h <<_ACEOF #define CXX_VAR "$CXX" diff --git a/configure.ac b/configure.ac index 959d2c5f..965a4a81 100644 --- a/configure.ac +++ b/configure.ac @@ -8,17 +8,16 @@ # # AC_INIT # -# checks for programs -# checks for libraries -# checks for header files -# checks for typedefs -# checks for structures -# checks for variables -# checks for compiler characteristics -# checks for library functions -# checks for system services +# 1. checks for programs +# 2. checks for libraries +# 3. checks for header files +# 4. checks for typedefs +# 5. checks for structures +# 6. checks for compiler characteristics +# 7. checks for library functions +# 8. checks for system services # -# AC_CONFIG_FILES([FILE...]) +# Read the Autoconf manual for details # SECTION 1: AC_INIT # @@ -59,6 +58,46 @@ AC_USE_SYSTEM_EXTENSIONS dnl This is a C++ library after all AC_LANG([C++]) +template= +AC_MSG_CHECKING([which template to use]) + +case $host_os in + linux*|gnu*|k*bsd*-gnu) + template=linux ;; + mingw*) template=win32 ;; + cygwin*) template=cygwin ;; +# aix*) template=aix ;; +# darwin*) template=darwin ;; +#dragonfly*) template=netbsd ;; +# freebsd*) template=freebsd ;; +# hpux*) template=hpux ;; +# netbsd*) template=netbsd ;; +# openbsd*) template=openbsd ;; +# sco*) template=sco ;; +# solaris*) template=solaris ;; +# sysv5*) template=unixware ;; +esac + + if test x"$template" = x"" ; then + AC_MSG_ERROR([[ +*************************************************************************** +ULib has apparently not been ported to your platform yet. Try a manual +configuration. Please also contact to see about +rectifying this. Include the above 'checking host system type...' line. +*************************************************************************** +]]) + fi + +AC_MSG_RESULT([$template]) + +PORTNAME=$template +AC_SUBST(PORTNAME) + +# +# Read the template +# +# . "$srcdir/src/template/$template" || exit + dnl Initial CXX, CFLAGS, CXXFLAGS, CPPFLAGS, LDFLAGS, LIBS AC_MSG_CHECKING(initial CXX) AC_MSG_RESULT($CXX) @@ -2880,6 +2919,44 @@ AC_SUBST(LDFLAGS) AC_SUBST(CXXFLAGS) AC_SUBST(CPPFLAGS) +# Check if the compiler still works with the final flag settings +AC_MSG_CHECKING([whether the C compiler still works]) +AC_LINK_IFELSE([AC_LANG_PROGRAM([], [return 0;])], + [AC_MSG_RESULT(yes)], + [AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot proceed])]) + +if test "$cross_compiling" != "yes"; then +# This test makes sure that run tests work at all. Sometimes a shared +# library is found by the linker, but the runtime linker can't find it. +# This check should come after all modifications of compiler or linker +# variables, and before any other run tests +AC_MSG_CHECKING([test program]) +AC_RUN_IFELSE([AC_LANG_SOURCE([int main() { return 0; }])], +[AC_MSG_RESULT(ok)], +[AC_MSG_RESULT(failed) +AC_MSG_ERROR([[ +Could not execute a simple test program. This may be a problem +related to locating shared libraries. Check the file 'config.log' +for the exact reason.]])], +[AC_MSG_RESULT([cross-compiling])]) +fi + +# Create compiler version string +if test x"$GCC" = x"yes" ; then + cc_string=`${CC} --version | sed q` + case $cc_string in [[A-Za-z]]*) ;; *) cc_string="GCC $cc_string";; esac +elif test x"$SUN_STUDIO_CC" = x"yes" ; then + cc_string=`${CC} -V 2>&1 | sed q` +else + cc_string=$CC +fi + +AC_MSG_NOTICE([using compiler=$cc_string]) +AC_MSG_NOTICE([using CFLAGS=$CFLAGS]) +AC_MSG_NOTICE([using CPPFLAGS=$CPPFLAGS]) +AC_MSG_NOTICE([using LDFLAGS=$LDFLAGS]) + AC_DEFINE_UNQUOTED(CXX_VAR, "$CXX", [Compiler]) AC_DEFINE_UNQUOTED(LIBS_VAR, "$ULIB_LIBS", [Libraries]) AC_DEFINE_UNQUOTED(CFLAGS_VAR, "$CFLAGS", [C Flags]) diff --git a/contrib/HCSP/Makefile.in b/contrib/HCSP/Makefile.in index b07687f9..0026a177 100644 --- a/contrib/HCSP/Makefile.in +++ b/contrib/HCSP/Makefile.in @@ -298,6 +298,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/contrib/Makefile.in b/contrib/Makefile.in index 143b1732..56423b81 100644 --- a/contrib/Makefile.in +++ b/contrib/Makefile.in @@ -280,6 +280,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/contrib/RSIGN/Makefile.in b/contrib/RSIGN/Makefile.in index 38c5b01a..4412cae8 100644 --- a/contrib/RSIGN/Makefile.in +++ b/contrib/RSIGN/Makefile.in @@ -270,6 +270,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/contrib/signer/Makefile.in b/contrib/signer/Makefile.in index 3d44dcf3..d8323e36 100644 --- a/contrib/signer/Makefile.in +++ b/contrib/signer/Makefile.in @@ -269,6 +269,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/doc/Makefile.in b/doc/Makefile.in index cfb07e0e..623ba804 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -218,6 +218,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/examples/IR/Makefile.in b/examples/IR/Makefile.in index 4aebe259..acd6b246 100644 --- a/examples/IR/Makefile.in +++ b/examples/IR/Makefile.in @@ -365,6 +365,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/examples/Makefile.in b/examples/Makefile.in index 19a480b5..62ed6c12 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -291,6 +291,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/examples/PEC_log/Makefile.in b/examples/PEC_log/Makefile.in index 9526721e..08ea16a6 100644 --- a/examples/PEC_log/Makefile.in +++ b/examples/PEC_log/Makefile.in @@ -366,6 +366,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/examples/WiAuth/Makefile.in b/examples/WiAuth/Makefile.in index 57b834be..0ed0af5b 100644 --- a/examples/WiAuth/Makefile.in +++ b/examples/WiAuth/Makefile.in @@ -392,6 +392,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/examples/WiAuth/v2/Makefile.in b/examples/WiAuth/v2/Makefile.in index bbe13d4f..7de05e29 100644 --- a/examples/WiAuth/v2/Makefile.in +++ b/examples/WiAuth/v2/Makefile.in @@ -301,6 +301,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/examples/XAdES/Makefile.in b/examples/XAdES/Makefile.in index c14372e2..0cf20e6e 100644 --- a/examples/XAdES/Makefile.in +++ b/examples/XAdES/Makefile.in @@ -309,6 +309,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/examples/csp/Makefile.in b/examples/csp/Makefile.in index 0f0e6f45..de8170fa 100644 --- a/examples/csp/Makefile.in +++ b/examples/csp/Makefile.in @@ -283,6 +283,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/examples/doc_classifier/Makefile.in b/examples/doc_classifier/Makefile.in index 37589196..fc360f41 100644 --- a/examples/doc_classifier/Makefile.in +++ b/examples/doc_classifier/Makefile.in @@ -290,6 +290,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/examples/doc_parse/Makefile.in b/examples/doc_parse/Makefile.in index 82df3bbe..cd21e619 100644 --- a/examples/doc_parse/Makefile.in +++ b/examples/doc_parse/Makefile.in @@ -270,6 +270,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/examples/download_accelerator/Makefile.in b/examples/download_accelerator/Makefile.in index dc9f40bf..58535296 100644 --- a/examples/download_accelerator/Makefile.in +++ b/examples/download_accelerator/Makefile.in @@ -271,6 +271,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/examples/form_completion/Makefile.in b/examples/form_completion/Makefile.in index 9640d0d8..7dcd0259 100644 --- a/examples/form_completion/Makefile.in +++ b/examples/form_completion/Makefile.in @@ -271,6 +271,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/examples/hello/Makefile.in b/examples/hello/Makefile.in index 3cbca7ae..df8704fd 100644 --- a/examples/hello/Makefile.in +++ b/examples/hello/Makefile.in @@ -267,6 +267,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/examples/http_header/Makefile.in b/examples/http_header/Makefile.in index 9be2f7fa..5ebea09f 100644 --- a/examples/http_header/Makefile.in +++ b/examples/http_header/Makefile.in @@ -269,6 +269,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/examples/lcsp/Makefile.in b/examples/lcsp/Makefile.in index 91402012..ad3f5f44 100644 --- a/examples/lcsp/Makefile.in +++ b/examples/lcsp/Makefile.in @@ -283,6 +283,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/examples/loginCookie/Makefile.in b/examples/loginCookie/Makefile.in index b3db954b..ec266474 100644 --- a/examples/loginCookie/Makefile.in +++ b/examples/loginCookie/Makefile.in @@ -299,6 +299,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/examples/lrp_session/Makefile.in b/examples/lrp_session/Makefile.in index bc771617..d1dcd25f 100644 --- a/examples/lrp_session/Makefile.in +++ b/examples/lrp_session/Makefile.in @@ -276,6 +276,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/examples/rsign/Makefile.in b/examples/rsign/Makefile.in index 02790fba..3c01e0da 100644 --- a/examples/rsign/Makefile.in +++ b/examples/rsign/Makefile.in @@ -284,6 +284,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/examples/serialize/Makefile.in b/examples/serialize/Makefile.in index ff3b3238..890e034e 100644 --- a/examples/serialize/Makefile.in +++ b/examples/serialize/Makefile.in @@ -267,6 +267,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/examples/simple_client_server/Makefile.in b/examples/simple_client_server/Makefile.in index 87958b42..8bc9fdb8 100644 --- a/examples/simple_client_server/Makefile.in +++ b/examples/simple_client_server/Makefile.in @@ -276,6 +276,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/examples/test_manager/Makefile.in b/examples/test_manager/Makefile.in index fe09e2d7..115e39e8 100644 --- a/examples/test_manager/Makefile.in +++ b/examples/test_manager/Makefile.in @@ -270,6 +270,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/examples/uclient/Makefile.in b/examples/uclient/Makefile.in index ba7c6bed..6b85cddd 100644 --- a/examples/uclient/Makefile.in +++ b/examples/uclient/Makefile.in @@ -301,6 +301,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/examples/userver/Makefile.in b/examples/userver/Makefile.in index 6ef6fdd2..9c29941f 100644 --- a/examples/userver/Makefile.in +++ b/examples/userver/Makefile.in @@ -338,6 +338,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/examples/workflow/Makefile.in b/examples/workflow/Makefile.in index 238092a7..d6479c0c 100644 --- a/examples/workflow/Makefile.in +++ b/examples/workflow/Makefile.in @@ -290,6 +290,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/examples/xml2txt/Makefile.in b/examples/xml2txt/Makefile.in index 1539c8db..7ffe3e85 100644 --- a/examples/xml2txt/Makefile.in +++ b/examples/xml2txt/Makefile.in @@ -270,6 +270,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/fuzz/Makefile.in b/fuzz/Makefile.in index 4c90d6d0..d16e1019 100644 --- a/fuzz/Makefile.in +++ b/fuzz/Makefile.in @@ -281,6 +281,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/include/Makefile.in b/include/Makefile.in index e06b8f95..2668ad79 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -309,6 +309,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/include/ulib/Makefile.in b/include/ulib/Makefile.in index fe935c73..16e9d9af 100644 --- a/include/ulib/Makefile.in +++ b/include/ulib/Makefile.in @@ -218,6 +218,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/include/ulib/container/hash_map.h b/include/ulib/container/hash_map.h index f65f3862..c0915926 100644 --- a/include/ulib/container/hash_map.h +++ b/include/ulib/container/hash_map.h @@ -884,6 +884,8 @@ public: U_INTERNAL_DUMP("_length = %u", _length) U_INTERNAL_ASSERT_EQUALS(_length, t._length) + + // t.clear(); } // STREAMS diff --git a/include/ulib/net/client/redis.h b/include/ulib/net/client/redis.h index bc6c3b10..298b87bd 100644 --- a/include/ulib/net/client/redis.h +++ b/include/ulib/net/client/redis.h @@ -228,7 +228,12 @@ public: (void) pipeline.insert(0, U_CONSTANT_TO_PARAM("CLIENT REPLY OFF \r\n")); (void) pipeline.append(U_CONSTANT_TO_PARAM("CLIENT REPLY ON \r\n")); - return sendRequest(pipeline); + bool result = sendRequest(pipeline); + + // CLIENT REPLY ON responds with "+OK\r\n" and no way to silence it + UClient_Base::readResponse(); + + return result; } // STRING (@see http://redis.io/commands#string) @@ -819,7 +824,6 @@ protected: U_TRACE_CTOR(0, UREDISClient_Base, "") err = 0; - U_NEW(UHashMap, pchannelCallbackMap, UHashMap()); } void init(); @@ -1036,7 +1040,7 @@ private: ClusterError error; UString temporaryASKip; UREDISClusterClient *subscriptionClient; - UHashMap clusterNodes; // when these call they need to be processed... also when MOVED... we need to set up and recalculate + UHashMap *clusterNodes; // when these call they need to be processed... also when MOVED... we need to set up and recalculate uint16_t hashslotForKey(const UString& hashableKey) { return u_crc16(U_STRING_TO_PARAM(hashableKey)); } @@ -1056,7 +1060,7 @@ private: { U_TRACE(0, "UREDISClusterMaster::clientForHashslot(%u)", hashslot) - for (UHashMapNode *node : clusterNodes) + for (UHashMapNode *node : *clusterNodes) { RedisClusterNode* workingNode = (RedisClusterNode *)(node->elem); @@ -1068,7 +1072,7 @@ private: UREDISClusterClient* clientForASKip() { - for (UHashMapNode *node : clusterNodes) + for (UHashMapNode *node : *clusterNodes) { RedisClusterNode* workingNode = (RedisClusterNode *)(node->elem); @@ -1117,6 +1121,12 @@ public: { U_NEW(UREDISClusterClient, subscriptionClient, UREDISClusterClient(this)); } + + ~UREDISClusterMaster() + { + U_DELETE(subscriptionClient); + if (clusterNodes) U_DELETE(clusterNodes); + } #if defined(U_STDCPP_ENABLE) && defined(DEBUG) const char* dump(bool _reset) const { return subscriptionClient->UREDISClient_Base::dump(_reset); } diff --git a/m4/Makefile.in b/m4/Makefile.in index d7c67e1d..fe70aef3 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -235,6 +235,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/src/ulib/Makefile.in b/src/ulib/Makefile.in index df907692..5ace5fab 100644 --- a/src/ulib/Makefile.in +++ b/src/ulib/Makefile.in @@ -660,6 +660,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/src/ulib/net/client/redis.cpp b/src/ulib/net/client/redis.cpp index 7494a4f4..a1c00da1 100644 --- a/src/ulib/net/client/redis.cpp +++ b/src/ulib/net/client/redis.cpp @@ -27,6 +27,7 @@ UREDISClient_Base::~UREDISClient_Base() if (pchannelCallbackMap) { U_DELETE(pchannelCallbackMap) + pchannelCallbackMap = U_NULLPTR; } } @@ -518,8 +519,6 @@ int UREDISClient_Base::handlerRead() { U_TRACE_NO_PARAM(0, "UREDISClient_Base::handlerRead()") - U_INTERNAL_ASSERT_POINTER(pchannelCallbackMap) - if ((clear(), UClient_Base::response.setEmpty(), UClient_Base::readResponse(U_SINGLE_READ))) { char prefix = UClient_Base::response[0]; @@ -538,6 +537,8 @@ int UREDISClient_Base::handlerRead() UString channel = vitem[1]; + U_INTERNAL_ASSERT_POINTER(pchannelCallbackMap) + vPFcscs callback = (vPFcscs) pchannelCallbackMap->at(channel); if (callback) callback(channel, vitem[2]); @@ -633,7 +634,9 @@ void UREDISClusterMaster::calculateNodeMap() (void) subscriptionClient->processRequest(U_RC_MULTIBULK, U_CONSTANT_TO_PARAM("CLUSTER SLOTS")); - UHashMap newNodes; + UHashMap *newNodes; + U_NEW(UHashMap, newNodes, UHashMap); + const UVector& rawNodes = subscriptionClient->vitem; for (uint32_t a = 0, b = rawNodes.size(); a < b; a+=2) @@ -656,7 +659,7 @@ void UREDISClusterMaster::calculateNodeMap() UString compositeAddress(50U); compositeAddress.snprintf(U_CONSTANT_TO_PARAM("%v.%v"), first.rep, second.rep); - RedisClusterNode *workingNode = clusterNodes.erase(compositeAddress); + RedisClusterNode *workingNode = clusterNodes ? clusterNodes->erase(compositeAddress) : U_NULLPTR; // in the case of MOVE some nodes will be new, but others we'll already be connected to if (workingNode) @@ -664,18 +667,21 @@ void UREDISClusterMaster::calculateNodeMap() workingNode->lowHashSlot = workingLowHashSlot; workingNode->highHashSlot = workingHighHashSlot; } - else workingNode = new RedisClusterNode(first, second.strtoul(), workingLowHashSlot, workingHighHashSlot, this); + else + { + U_NEW(RedisClusterNode, workingNode, RedisClusterNode(first, second.strtoul(), workingLowHashSlot, workingHighHashSlot, this)); + } - newNodes.insert(compositeAddress, workingNode); - - workingNode = newNodes[compositeAddress]; + newNodes->insert(compositeAddress, workingNode); findHashSlots = true; } } // if any nodes were taken offline, the clients would've disconnected by default - clusterNodes.assign(newNodes); + if (clusterNodes) U_DELETE(clusterNodes); + + clusterNodes = newNodes; } bool UREDISClusterMaster::connect(const char* host, unsigned int _port) @@ -685,13 +691,16 @@ bool UREDISClusterMaster::connect(const char* host, unsigned int _port) if (subscriptionClient->connect(host, _port)) { calculateNodeMap(); + + U_INTERNAL_ASSERT_EQUALS(UREDISClient_Base::pchannelCallbackMap, U_NULLPTR) + + U_NEW(UHashMap, UREDISClient_Base::pchannelCallbackMap, UHashMap()); subscriptionClient->UEventFd::fd = subscriptionClient->getFd(); subscriptionClient->UEventFd::op_mask |= EPOLLET; - subscriptionClient->UEventFd::op_mask &= ~EPOLLRDHUP; - - UServer_Base::addHandlerEvent(subscriptionClient); // NB: we ask to listen for events to a Redis publish channel... - + + UServer_Base::addHandlerEvent(subscriptionClient); + U_RETURN(true); } @@ -755,7 +764,12 @@ const UVector& UREDISClusterMaster::processPipeline(UString& pipeline, UREDISClusterClient* client = clientForHashslot(hashslot); - if constexpr (silence) (void) client->sendRequest(workingString); + if constexpr (silence) + { + (void) client->sendRequest(workingString); + // CLIENT REPLY ON responds with "+OK\r\n" and no way to silence it + client->UClient_Base::readResponse(); + } else { replay: (void) client->processRequest(U_RC_MULTIBULK, U_STRING_TO_PARAM(workingString)); diff --git a/src/ulib/net/server/plugin/Makefile.in b/src/ulib/net/server/plugin/Makefile.in index c386d13c..e36182e9 100644 --- a/src/ulib/net/server/plugin/Makefile.in +++ b/src/ulib/net/server/plugin/Makefile.in @@ -508,6 +508,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/src/ulib/net/server/plugin/mod_geoip/Makefile.in b/src/ulib/net/server/plugin/mod_geoip/Makefile.in index 7a58f9e5..d0e88c87 100644 --- a/src/ulib/net/server/plugin/mod_geoip/Makefile.in +++ b/src/ulib/net/server/plugin/mod_geoip/Makefile.in @@ -297,6 +297,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/src/ulib/net/server/plugin/mod_shib/Makefile.in b/src/ulib/net/server/plugin/mod_shib/Makefile.in index cfc2be0c..9e3dd74d 100644 --- a/src/ulib/net/server/plugin/mod_shib/Makefile.in +++ b/src/ulib/net/server/plugin/mod_shib/Makefile.in @@ -297,6 +297,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/src/ulib/net/server/plugin/page_speed/Makefile.in b/src/ulib/net/server/plugin/page_speed/Makefile.in index ab4c37b6..cc94da8e 100644 --- a/src/ulib/net/server/plugin/page_speed/Makefile.in +++ b/src/ulib/net/server/plugin/page_speed/Makefile.in @@ -298,6 +298,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/src/ulib/net/server/plugin/php/Makefile.in b/src/ulib/net/server/plugin/php/Makefile.in index cde696ad..38bc3c74 100644 --- a/src/ulib/net/server/plugin/php/Makefile.in +++ b/src/ulib/net/server/plugin/php/Makefile.in @@ -297,6 +297,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/src/ulib/net/server/plugin/python/Makefile.in b/src/ulib/net/server/plugin/python/Makefile.in index f4ac81ab..515b5bc8 100644 --- a/src/ulib/net/server/plugin/python/Makefile.in +++ b/src/ulib/net/server/plugin/python/Makefile.in @@ -298,6 +298,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/src/ulib/net/server/plugin/ruby/Makefile.in b/src/ulib/net/server/plugin/ruby/Makefile.in index 06fd49d9..5923a188 100644 --- a/src/ulib/net/server/plugin/ruby/Makefile.in +++ b/src/ulib/net/server/plugin/ruby/Makefile.in @@ -297,6 +297,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/src/ulib/net/server/plugin/usp/Makefile.in b/src/ulib/net/server/plugin/usp/Makefile.in index 0ac9ed8f..bf978176 100644 --- a/src/ulib/net/server/plugin/usp/Makefile.in +++ b/src/ulib/net/server/plugin/usp/Makefile.in @@ -305,6 +305,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/src/ulib/net/server/plugin/v8/Makefile.in b/src/ulib/net/server/plugin/v8/Makefile.in index a8fc21b1..5e2c817c 100644 --- a/src/ulib/net/server/plugin/v8/Makefile.in +++ b/src/ulib/net/server/plugin/v8/Makefile.in @@ -297,6 +297,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/src/ulib/net/server/server.cpp b/src/ulib/net/server/server.cpp index b352ed43..7fd42ee1 100644 --- a/src/ulib/net/server/server.cpp +++ b/src/ulib/net/server/server.cpp @@ -4508,7 +4508,14 @@ void UServer_Base::runLoop(const char* user) UNotifier::min_connection += n; - for (uint32_t i = 0; i < n; ++i) (*handler_other)[i]->UEventFd::op_mask &= ~EPOLLRDHUP; + for (uint32_t i = 0; i < n; ++i) + { + U_INTERNAL_DUMP("(*handler_other)[%u]->UEventFd::fd = %d", i, (*handler_other)[i]->UEventFd::fd) + + U_INTERNAL_ASSERT_DIFFERS((*handler_other)[i]->UEventFd::fd, -1) + + (*handler_other)[i]->UEventFd::op_mask &= ~EPOLLRDHUP; + } } UNotifier::max_connection += (UNotifier::num_connection = UNotifier::min_connection); diff --git a/src/ulib/orm/driver/Makefile.in b/src/ulib/orm/driver/Makefile.in index 2d62eae4..4a7d4cd6 100644 --- a/src/ulib/orm/driver/Makefile.in +++ b/src/ulib/orm/driver/Makefile.in @@ -332,6 +332,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/src/ulib/orm/driver/libpq/Makefile.in b/src/ulib/orm/driver/libpq/Makefile.in index 59dc4500..a0f8222e 100644 --- a/src/ulib/orm/driver/libpq/Makefile.in +++ b/src/ulib/orm/driver/libpq/Makefile.in @@ -272,6 +272,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/tests/Makefile.in b/tests/Makefile.in index b2710712..15a64923 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -280,6 +280,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/tests/base/Makefile.in b/tests/base/Makefile.in index 6423776c..a7288ec0 100644 --- a/tests/base/Makefile.in +++ b/tests/base/Makefile.in @@ -552,6 +552,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/tests/contrib/Makefile.in b/tests/contrib/Makefile.in index 00a2f577..ac490f47 100644 --- a/tests/contrib/Makefile.in +++ b/tests/contrib/Makefile.in @@ -423,6 +423,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/tests/debug/Makefile.in b/tests/debug/Makefile.in index 0a54f464..41933dd9 100644 --- a/tests/debug/Makefile.in +++ b/tests/debug/Makefile.in @@ -492,6 +492,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/tests/examples/Makefile.in b/tests/examples/Makefile.in index 30175ea1..516bdd19 100644 --- a/tests/examples/Makefile.in +++ b/tests/examples/Makefile.in @@ -508,6 +508,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/tests/examples/TSA/tsaserial b/tests/examples/TSA/tsaserial index 8dda154a..be9f1574 100644 --- a/tests/examples/TSA/tsaserial +++ b/tests/examples/TSA/tsaserial @@ -1 +1 @@ -0601 +0604 diff --git a/tests/ulib/Makefile.in b/tests/ulib/Makefile.in index 5841b864..9bb45f83 100644 --- a/tests/ulib/Makefile.in +++ b/tests/ulib/Makefile.in @@ -993,6 +993,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@ diff --git a/tests/ulib/http2/Makefile.in b/tests/ulib/http2/Makefile.in index aa5fbeba..b4fe1d44 100644 --- a/tests/ulib/http2/Makefile.in +++ b/tests/ulib/http2/Makefile.in @@ -476,6 +476,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@ PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@ PHPCONFIGLIBS = @PHPCONFIGLIBS@ PKG_CONFIG = @PKG_CONFIG@ +PORTNAME = @PORTNAME@ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@ POSTGRESQL_LIBS = @POSTGRESQL_LIBS@