Merge branch 'master' into dev-admin

diff --combined lib/Makefile
index 24e5a87603055e462a0a75a35ff4725722700449,9efb1f69299034290a28364a692ba8d82e796874..0c5d0ac730b192a92675f47dc200d8dcc5dcd3d5
--- 1/lib/Makefile
--- 2/lib/Makefile
+++ b/lib/Makefile
@@@ -18,7 -18,7 +18,7 @@@ LIBUCW_MODS= 
        ipaccess \
        profile \
        fastbuf ff-binary ff-string ff-printf ff-unicode \
-       fb-file carefulio fb-mem fb-temp fb-mmap fb-limfd fb-buffer fb-grow fb-pool fb-atomic fb-param \
+       fb-file carefulio fb-mem fb-temp fb-mmap fb-limfd fb-buffer fb-grow fb-pool fb-atomic fb-param fb-socket \
        str_ctype str_upper str_lower unicode stkstring \
        wildmatch wordsplit ctmatch patimatch patmatch regex \
        prime primetable random timer randomkey \
@@@ -49,7 -49,7 +49,7 @@@ LIBUCW_INCLUDES= 
        bitops.h \
        conf.h getopt.h ipaccess.h \
        profile.h \
-       fastbuf.h lfs.h ff-unicode.h ff-utf8.h ff-binary.h \
+       fastbuf.h lfs.h ff-unicode.h ff-binary.h \
        chartype.h unicode.h stkstring.h \
        wildmatch.h patmatch.h \
        db.h \
@@@ -68,10 -68,6 +68,6 @@@ LIBUCW_MODS+=threads-conf workqueue asi
  LIBUCW_INCLUDES+=workqueue.h semaphore.h asio.h
  endif
  
- ifdef CONFIG_OWN_REGEX
- include $(s)/lib/regex/Makefile
- endif
- 
  ifdef CONFIG_OWN_GETOPT
  include $(s)/lib/getopt/Makefile
  endif
@@@ -98,10 -94,10 +94,11 @@@ $(o)/lib/binheap-test: $(o)/lib/binheap
  $(o)/lib/lizard-test: $(o)/lib/lizard-test.o $(LIBUCW)
  $(o)/lib/kmp-test: $(o)/lib/kmp-test.o $(LIBUCW) $(LIBCHARSET)
  $(o)/lib/ipaccess-test: $(o)/lib/ipaccess-test.o $(LIBUCW)
 +$(o)/lib/trie-test: $(o)/lib/trie-test.o $(LIBUCW)
  
  TESTS+=$(addprefix $(o)/lib/,regex.test unicode.test hash-test.test mempool.test stkstring.test \
-     slists.test kmp-test.test bbuf.test getopt.test fastbuf.test ff-unicode.test eltpool.test trie-test.test)
+     slists.test kmp-test.test bbuf.test getopt.test fastbuf.test ff-unicode.test eltpool.test \
 -    fb-socket.test)
++    fb-socket.test trie-test.test)
  
  $(o)/lib/regex.test: $(o)/lib/regex-t
  $(o)/lib/unicode.test: $(o)/lib/unicode-t
@@@ -116,7 -112,7 +113,8 @@@ $(o)/lib/getopt.test: $(o)/lib/getopt-
  $(o)/lib/fastbuf.test: $(o)/lib/fb-file-t $(o)/lib/fb-grow-t $(o)/lib/fb-pool-t
  $(o)/lib/ff-unicode.test: $(o)/lib/ff-unicode-t
  $(o)/lib/eltpool.test: $(o)/lib/eltpool-t
+ $(o)/lib/fb-socket.test: $(o)/lib/fb-socket-t
 +$(o)/lib/trie-test.test: $(o)/lib/trie-test
  
  ifdef CONFIG_UCW_THREADS
  TESTS+=$(addprefix $(o)/lib/,asio.test)