Merge branch 'master' of https://github.com/3proxy/3proxy

Makefile.llvm

@@ -30,9 +30,17 @@ TYPECOMMAND = cat
 COMPATLIBS =
 MAKEFILE = Makefile.llvm
 PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlugin SSLPlugin
+VERFILE := 3proxy.res $(VERFILE)
+VERSION := $(VERSION)
+VERSIONDEP := 3proxy.res $(VERSIONDEP)
+BUILDDATE := $(BUILDDATE)
+AFTERCLEAN = (find . -type f -name "*.o" -delete && find . -type f -name "*.res" -delete && find src/ -type f -name "Makefile.var" -delete && find bin/ -type f -executable -delete) || true
 
 include Makefile.inc
 
+3proxy.res:
+	llvm-rc 3proxy.rc
+
 allplugins:
 	@list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; make ;	cd ../.. ; done
 

Makefile.win

@@ -29,9 +29,17 @@ TYPECOMMAND = cat
 COMPATLIBS =
 MAKEFILE = Makefile.win
 PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlugin SSLPLugin
+VERFILE := 3proxyres.o $(VERFILE)
+VERSION := $(VERSION)
+VERSIONDEP := 3proxyres.o $(VERSIONDEP)
+BUILDDATE := $(BUILDDATE)
+AFTERCLEAN = (find . -type f -name "*.o" -delete && find . -type f -name "*.res" -delete && find src/ -type f -name "Makefile.var" -delete && find bin/ -type f -executable -delete) || true
 
 include Makefile.inc
 
+3proxyres.o:
+	windres 3proxy.rc -o 3proxyres.o
+
 allplugins:
 	@list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; make ;	cd ../.. ; done
 

src/auto.c

@@ -23,6 +23,7 @@ void * autochild(struct clientparam* param) {
 	dolog(param, (unsigned char *)"");
     }
     if(*param->clibuf == 4 || *param->clibuf == 5) return sockschild(param);
+    if(*param->clibuf == 22) return tlsprchild(param);
     return proxychild(param);
 }