update

2024-11-26 04:31:37 +08:00 · 2017-12-29 18:46:01 +08:00 · 2017-12-29 18:46:01 +08:00 · 82e3907dfa
commit 82e3907dfa
parent 723c1294c6
28 changed files with 58 additions and 30 deletions
--- a/bin_lib/windows/ZLMediaKit.dll
+++ b/bin_lib/windows/ZLMediaKit.dll
--- a/bin_lib/windows/ZLMediaKit.lib
+++ b/bin_lib/windows/ZLMediaKit.lib
--- a/bin_lib/windows/ZLToolKit.dll
+++ b/bin_lib/windows/ZLToolKit.dll
--- a/bin_lib/windows/libmysql.dll
+++ b/bin_lib/windows/libmysql.dll
--- a/bin_lib/windows/test_asyncTaskThrad.exe
+++ b/bin_lib/windows/test_asyncTaskThrad.exe
--- a/bin_lib/windows/test_benchmark.exe
+++ b/bin_lib/windows/test_benchmark.exe
--- a/bin_lib/windows/test_eventPoller.exe
+++ b/bin_lib/windows/test_eventPoller.exe
--- a/bin_lib/windows/test_httpApi.exe
+++ b/bin_lib/windows/test_httpApi.exe
--- a/bin_lib/windows/test_httpClient.exe
+++ b/bin_lib/windows/test_httpClient.exe
--- a/bin_lib/windows/test_logger.exe
+++ b/bin_lib/windows/test_logger.exe
--- a/bin_lib/windows/test_noticeCenter.exe
+++ b/bin_lib/windows/test_noticeCenter.exe
--- a/bin_lib/windows/test_pipe.exe
+++ b/bin_lib/windows/test_pipe.exe
--- a/bin_lib/windows/test_resourcePool.exe
+++ b/bin_lib/windows/test_resourcePool.exe
--- a/bin_lib/windows/test_ringBuffer.exe
+++ b/bin_lib/windows/test_ringBuffer.exe
--- a/bin_lib/windows/test_rtmpPusher.exe
+++ b/bin_lib/windows/test_rtmpPusher.exe
--- a/bin_lib/windows/test_rtmpPusherMp4.exe
+++ b/bin_lib/windows/test_rtmpPusherMp4.exe
--- a/bin_lib/windows/test_rwmutex.exe
+++ b/bin_lib/windows/test_rwmutex.exe
--- a/bin_lib/windows/test_semaphore.exe
+++ b/bin_lib/windows/test_semaphore.exe
--- a/bin_lib/windows/test_server.exe
+++ b/bin_lib/windows/test_server.exe
--- a/bin_lib/windows/test_server.exe.ini
+++ b/bin_lib/windows/test_server.exe.ini
@ -0,0 +1,58 @@
+; auto-generated by mINI class {
+
+[hls]
+fileBufSize=65536
+filePath=D:/CLionProjects/ZLMediaKit/bin_lib/windows/httpRoot
+segDur=0
+segNum=1
+
+[http]
+charSet=gb2312
+httpPrefix=http://192.168.31.99:80
+keepAliveSecond=5
+maxReqCount=100
+maxReqSize=4096
+notFound=<html><head><title>404 Not Found</title></head><body bgcolor="white"><center><h1>Äú·ÃÎÊµÄ×ÊÔ´²»´æÔÚ£¡</h1></center><hr><center>ZLServer</center></body></html>
+port=80
+rootPath=D:/CLionProjects/ZLMediaKit/bin_lib/windows/httpRoot
+sendBufSize=65536
+serverName=ZLServer
+sslport=443
+
+[multicast]
+addrMax=4026531839
+addrMin=3758096649
+udpTTL=64
+
+[proxy]
+replayCount=18446744073709551615
+
+[record]
+appName=record
+filePath=D:/CLionProjects/ZLMediaKit/bin_lib/windows/httpRoot
+fileSecond=600
+rtspPrefix=rtsp://192.168.31.99:554
+sampleMS=100
+
+[rtmp]
+port=1935
+
+[rtp]
+audioMtuSize=600
+clearCount=10
+cycleMS=46800000
+maxRtpCount=50
+udpBufSize=131072
+videoMtuSize=1400
+
+[rtsp]
+authBasic=0
+port=554
+serverName=ZLServer
+
+[shell]
+maxReqSize=1024
+port=9000
+serverName=ZLServer
+
+; } ---
--- a/bin_lib/windows/test_spin_mutex.exe
+++ b/bin_lib/windows/test_spin_mutex.exe
--- a/bin_lib/windows/test_sql.exe
+++ b/bin_lib/windows/test_sql.exe
--- a/bin_lib/windows/test_ssl.exe
+++ b/bin_lib/windows/test_ssl.exe
--- a/bin_lib/windows/test_ssl.exe.pem
+++ b/bin_lib/windows/test_ssl.exe.pem
@ -1,30 +0,0 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDe56xOopefsL3K+kfpDohkBnjZaTCLVdS+p6BUeRbeFO9xOaGy
-5hPnVLHI1nlpRZaKfxm1MY9fDBh1kSbjhSqim9HUBoSvEE32yMM+0GIoNKKDWmhd
-ePDXuSNO6d9nabg+5gmrR2fyYtSigTH6liqGSjhblAozlaXVZVYZOs/ePwIDAQAB
-AoGAYcjkMALn3SgduoOdNEIp1yd3sHiS0S0wDQtgLG6Kd5ZbjCIqK17/cEYZT++2
-h1X9ungTgQdiy+F0gW7RzpHGp4lso2a8PgEUIt4HICLZqBOWv6kId43kysBZQS/5
-5g0ZGJGU5BFTdHzN5chaPE32MRGPpukNngRuRruRvoQaOuECQQD0EoC6EHwLehFI
-KoLnDtzXpR1f4eRRbxJ6U/05Kr4+nz+MB7A2ilGEf+E7iCvoRGYkuieEuKYS9+NQ
-Bv67i/aZAkEA6cxan6Q5BsSCoIKGbqATxW40j7m0Ii3VFb4w9vgaI0mHdRl9x59x
-LKsIamcJZI7szmJdOi3tBKB9Xc3PxfD6lwJBAIYOU53eyAMVvMBCeTunsizPh97O
-F7WSqDeAQilQDMYgearT3jlWp4d7JZ6pIFSmnOO3S1VehfkNJlEiRm+EZKECQCEb
-+IV9GzpTH/CdK26FKueduMHV2aWxeeivW33OGt1+bzltF7vqX3uk6Pcwikr8VprP
-oUY49MTf+YEMQW1VuBcCQA3UvxGx7YbD3RihysBmTLHyF2DOR3pBQdL1jH5fFI9k
-mMo0M2cvHytsIYZ69oULJkQ0TyNBslm/TLaHAK6fHbo=
-----END RSA PRIVATE KEY-----
-----BEGIN CERTIFICATE-----
-MIICWDCCAcGgAwIBAgIJANTNO5CfgnKmMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV
-BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
-aWRnaXRzIFB0eSBMdGQwHhcNMTYwMTExMDgyNTIxWhcNMTkwMTEwMDgyNTIxWjBF
-MQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50
-ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
-gQDe56xOopefsL3K+kfpDohkBnjZaTCLVdS+p6BUeRbeFO9xOaGy5hPnVLHI1nlp
-RZaKfxm1MY9fDBh1kSbjhSqim9HUBoSvEE32yMM+0GIoNKKDWmhdePDXuSNO6d9n
-abg+5gmrR2fyYtSigTH6liqGSjhblAozlaXVZVYZOs/ePwIDAQABo1AwTjAdBgNV
-HQ4EFgQUKOfhSgRHIkKMX7cwlVIBR493EXQwHwYDVR0jBBgwFoAUKOfhSgRHIkKM
-X7cwlVIBR493EXQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOBgQCxs7Ge
-0mjdtHhFd7qerYVYS0uvVzRdYsYnK+rY6Y5wtXEWDNG2EOLA5/puaj93mvesKXTl
-plTjFUnhmyXwwvXuKx+PdK87FXl4sTIyvf4/1eN2QIpy6WU4lAE11ONNF8djNc4W
-FCu9etyoYfy6NE4C/ntJpB0xCNrX1cvrmukb6g==
-----END CERTIFICATE-----
--- a/bin_lib/windows/test_tcpClient.exe
+++ b/bin_lib/windows/test_tcpClient.exe
--- a/bin_lib/windows/test_tcpEchoServer.exe
+++ b/bin_lib/windows/test_tcpEchoServer.exe
--- a/bin_lib/windows/test_threadPool.exe
+++ b/bin_lib/windows/test_threadPool.exe
--- a/bin_lib/windows/test_udpSock.exe
+++ b/bin_lib/windows/test_udpSock.exe