Skip to content

Commit 57e5564

Browse files
upluswareuplusware
committed
1.3
1.3
1 parent 5d9e4d6 commit 57e5564

10 files changed

+26
-15
lines changed

‎api/storage.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ int DatabaseStorage::Ping()
176176

177177
return (ret_val ? 0 : -1);
178178
#else
179-
//printf("mysql ping\n");
180179
return mysql_ping(m_hMySQL);
181180
#endif /* _MONGODB_ */
182181
}

‎binary/centos8-heaphttpd-bin-async-x86_64-linux-1.2.tar.gz‎

-1.74 MB
Binary file not shown.

‎binary/centos8-heaphttpd-bin-async-x86_64-linux-1.3.tar.gz‎

1.74 MB
Binary file not shown.

‎binary/centos8-heaphttpd-bin-thread-x86_64-linux-1.3.tar.gz‎

1.74 MB
Binary file not shown.

‎binary/centos8-heaphttpd-bin-threads-x86_64-linux-1.2.tar.gz‎

-1.74 MB
Binary file not shown.

‎build_release_all.sh‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
#!/bin/bash
2+
SCRIPT_DIR=$(cd "$(dirname "$0")"; pwd)
23
VERSION=1.3
34
OS=centos8
4-
SCRIPT_DIR=$(cd "$(dirname "$0")"; pwd)
5-
cd ${SCRIPT_DIR}/src/
65

6+
#async arch
7+
NAME=async
8+
cd ${SCRIPT_DIR}/src/
79
make clean
8-
make
10+
make ASYNC=1
911
cd ${SCRIPT_DIR}
1012
chmod a+x ${SCRIPT_DIR}/release.sh
11-
${SCRIPT_DIR}/release.sh ${VERSION} threads ${OS}
13+
${SCRIPT_DIR}/release.sh ${VERSION} ${NAME} ${OS}
1214

15+
#thread arch
16+
NAME=thread
1317
cd ${SCRIPT_DIR}/src/
1418
make clean
15-
make ASYNC=1
1619
cd ${SCRIPT_DIR}
1720
chmod a+x ${SCRIPT_DIR}/release.sh
18-
${SCRIPT_DIR}/release.sh ${VERSION} async ${OS}
21+
${SCRIPT_DIR}/release.sh ${VERSION} ${NAME} ${OS}

‎build_release_install.sh‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,27 @@
11
#!/bin/bash
2+
SCRIPT_DIR=$(cd "$(dirname "$0")"; pwd)
23
VERSION=1.3
34
OS=centos8
4-
NAME=dev
5-
SCRIPT_DIR=$(cd "$(dirname "$0")"; pwd)
5+
6+
#async arch
7+
NAME=async
68
cd ${SCRIPT_DIR}/src/
79
make clean
810
make ASYNC=1
911
cd ${SCRIPT_DIR}
1012
chmod a+x ${SCRIPT_DIR}/release.sh
1113
${SCRIPT_DIR}/release.sh ${VERSION} ${NAME} ${OS}
14+
15+
#thread arch
16+
NAME=thread
17+
cd ${SCRIPT_DIR}/src/
18+
make clean
19+
make
20+
cd ${SCRIPT_DIR}
21+
chmod a+x ${SCRIPT_DIR}/release.sh
22+
${SCRIPT_DIR}/release.sh ${VERSION} ${NAME} ${OS}
23+
24+
#pick one and install
1225
chmod a+x ${SCRIPT_DIR}/${OS}-heaphttpd-bin-${NAME}-x86_64-linux/install.sh
1326
sudo ${SCRIPT_DIR}/${OS}-heaphttpd-bin-${NAME}-x86_64-linux/install.sh
1427
sudo /etc/init.d/heaphttpd restart

‎html/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<html>
22
<head>
33
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
4-
<title>Heaphttpd Web Server/1.1</title>
4+
<title>Heaphttpd Web Server/1.3</title>
55
<script type="text/javascript">
66
function WebSocketSample()
77
{
@@ -42,7 +42,7 @@
4242
</script>
4343
</head>
4444
<body>
45-
<h1>Heaphttpd Web Server/1.1</h1>
45+
<h1>Heaphttpd Web Server/1.3</h1>
4646
<hr>
4747
<image src="heaphttpd.png" />
4848
<p>Performance Test(depends on api/perf)</p>

‎src/util/general.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1090,7 +1090,6 @@ int __inline__ code_convert(const char *from_charset, const char *to_charset, co
10901090

10911091
int __inline__ code_convert_ex(const char *from_charset, const char *to_charset, const char *inbuf, string& strout)
10921092
{
1093-
//printf("%s => %s\n", from_charset, to_charset);
10941093
if(strcasecmp(from_charset, to_charset) == 0)
10951094
{
10961095
strout = inbuf;

‎src/util/huffman.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ int hf_byte_encode(unsigned char ch, int remain, unsigned char *buff){
8686
int i = 0;
8787
int codes = HEX_TO_HF_CODE(ch);
8888
int nbits = HEX_TO_HF_CODE_LEN(ch);
89-
//printf("'%c'|codes(%d)|len(%d)\n", ch, codes, nbits );
9089
for(;;){
9190
if( remain > nbits){
9291
t = (unsigned char)(codes << (remain-nbits));
@@ -149,8 +148,6 @@ int hf_string_decode(NODE* h_node, unsigned char *enc, int enc_sz, char *out_buf
149148
printf("invalid huffmand code\n");
150149
return -1; //invalid huffmand code
151150
}
152-
//printf("n->sym : %c , n->size = %d\n", n->sym, n->size);
153-
//if( n->children == NULL){
154151
if( n->size == 0){
155152
if( out_sz > 0 && at > out_sz){
156153
printf("out of length\n");

0 commit comments

Comments
 (0)