Skip to content

Commit 07c5229

Browse files
xfeepxfeep
committed
🔖 prepare for release v0.5.1
1 parent bd61278 commit 07c5229

File tree

10 files changed

+112
-16
lines changed

10 files changed

+112
-16
lines changed

‎HISTORY.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@ Downloads & Release History
44
1. [Binaries of Releases](http://sourceforge.net/projects/nginx-clojure/files/)
55
1. [Sources of Releases](https://github.com/nginx-clojure/nginx-clojure/releases)
66

7+
## 0.5.1 (2019-11-23)
8+
9+
1. Bug Fix: Connection hangs with header filter at thread-pool mode #209 #153
10+
1. Bug Fix: Body filter hangs when body size is larger than the value specified in proxy_buffers #219
11+
1. Bug Fix: Segment fault caused by request is marked as closed too late #222
12+
1. Code Style: Fix generic warnings in java code code-style #223 (Thanks to Michael @mgoblin)
13+
1. Bug Fix: NPE caused by damaged memory because unsafe modify response headers #198
14+
1. Bug Fix: Wrong response for uncompressed message with PMCE enabled
15+
1. CI: both auto-triggered unit test and integration test use travis-ci
716

817
## 0.5.0 (2019-10-26)
918

‎README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ With this feature one java main thread can handle thousands of connections.
3535
1. Support user defined http request method
3636
1. Compatible with the Nginx lastest most stable version 1.14.2. (Nginx 1.12.x, 1.8.x, 1.6.x, 1.4.x is also ok, older version is not tested and maybe works.)
3737
1. One of benifits of [Nginx](http://nginx.org/) is worker processes are automatically restarted by a master process if they crash
38-
1. Utilizes lazy headers and direct memory operation between [Nginx](http://nginx.org/) and JVM to fast handle dynamic contents from Clojure or Java code.
39-
1. Utilizes [Nginx](http://nginx.org/) zero copy file sending mechanism to fast handle static contents controlled by Clojure or Java code.
40-
1. Supports Linux x64, Linux x86 32bit, Win32, Win64 and Mac OS X. Freebsd version can also be got from Freebsd ports.
38+
1. Utilize lazy headers and direct memory operation between [Nginx](http://nginx.org/) and JVM to fast handle dynamic contents from Clojure or Java code.
39+
1. Utilize [Nginx](http://nginx.org/) zero copy file sending mechanism to fast handle static contents controlled by Clojure or Java code.
40+
1. Support Linux x64, Linux x86 32bit, Win32, Win64 and Mac OS X. Freebsd version can also be got from Freebsd ports.
4141

4242
By the way it is very fast, the benchmarks can be found [HERE(with wrk2)](https://github.com/ptaoussanis/clojure-web-server-benchmarks/).
4343

@@ -53,19 +53,19 @@ Nginx-Clojure has already been published to https://clojars.org/ whose maven rep
5353
</repository>
5454
```
5555

56-
After adding clojars repository, you can reference nginx-clojure 0.5.0 , e.g.
56+
After adding clojars repository, you can reference nginx-clojure 0.5.1 , e.g.
5757

5858
Leiningen (clojure, no need to add clojars repository which is a default repository for Leiningen)
5959
-----------------
6060

6161
```clojure
62-
[nginx-clojure "0.5.0"]
62+
[nginx-clojure "0.5.1"]
6363
```
6464
Gradle (groovy/java)
6565
-----------------
6666

6767
```
68-
compile "nginx-clojure:nginx-clojure:0.5.0"
68+
compile "nginx-clojure:nginx-clojure:0.5.1"
6969
```
7070
Maven
7171
-----------------
@@ -74,7 +74,7 @@ Maven
7474
<dependency>
7575
<groupId>nginx-clojure</groupId>
7676
<artifactId>nginx-clojure</artifactId>
77-
<version>0.5.0</version>
77+
<version>0.5.1</version>
7878
</dependency>
7979
```
8080

‎example-projects/clojure-web-example/conf/mime.types

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
2+
types {
3+
text/html html htm shtml;
4+
text/css css;
5+
text/xml xml;
6+
image/gif gif;
7+
image/jpeg jpeg jpg;
8+
application/x-javascript js;
9+
application/atom+xml atom;
10+
application/rss+xml rss;
11+
12+
text/mathml mml;
13+
text/plain txt c;
14+
text/vnd.sun.j2me.app-descriptor jad;
15+
text/vnd.wap.wml wml;
16+
text/x-component htc;
17+
18+
image/png png;
19+
image/tiff tif tiff;
20+
image/vnd.wap.wbmp wbmp;
21+
image/x-icon ico;
22+
image/x-jng jng;
23+
image/x-ms-bmp bmp;
24+
image/svg+xml svg svgz;
25+
image/webp webp;
26+
27+
application/java-archive jar war ear;
28+
application/mac-binhex40 hqx;
29+
application/msword doc;
30+
application/pdf pdf;
31+
application/postscript ps eps ai;
32+
application/rtf rtf;
33+
application/vnd.ms-excel xls;
34+
application/vnd.ms-powerpoint ppt;
35+
application/vnd.wap.wmlc wmlc;
36+
application/vnd.google-earth.kml+xml kml;
37+
application/vnd.google-earth.kmz kmz;
38+
application/x-7z-compressed 7z;
39+
application/x-cocoa cco;
40+
application/x-java-archive-diff jardiff;
41+
application/x-java-jnlp-file jnlp;
42+
application/x-makeself run;
43+
application/x-perl pl pm;
44+
application/x-pilot prc pdb;
45+
application/x-rar-compressed rar;
46+
application/x-redhat-package-manager rpm;
47+
application/x-sea sea;
48+
application/x-shockwave-flash swf;
49+
application/x-stuffit sit;
50+
application/x-tcl tcl tk;
51+
application/x-x509-ca-cert der pem crt;
52+
application/x-xpinstall xpi;
53+
application/xhtml+xml xhtml;
54+
application/zip zip;
55+
56+
application/octet-stream bin exe dll;
57+
application/octet-stream deb;
58+
application/octet-stream dmg;
59+
application/octet-stream eot;
60+
application/octet-stream iso img;
61+
application/octet-stream msi msp msm;
62+
63+
audio/midi mid midi kar;
64+
audio/mpeg mp3;
65+
audio/ogg ogg;
66+
audio/x-m4a m4a;
67+
audio/x-realaudio ra;
68+
69+
video/3gpp 3gpp 3gp;
70+
video/mp4 mp4;
71+
video/mpeg mpeg mpg;
72+
video/quicktime mov;
73+
video/webm webm;
74+
video/x-flv flv;
75+
video/x-m4v m4v;
76+
video/x-mng mng;
77+
video/x-ms-asf asx asf;
78+
video/x-ms-wmv wmv;
79+
video/x-msvideo avi;
80+
}

‎example-projects/clojure-web-example/conf/nginx.conf

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,12 @@ http {
4848

4949
## Define class path. When '/*' is used after a directory path all jar files and
5050
##sub-directories will be used as the jvm classpath
51-
jvm_classpath "libs/*";
51+
jvm_classpath "/home/who/git/nginx-clojure/target/nginx-clojure-0.5.1.jar:/home/who/git/nginx-clojure/example-projects/clojure-web-example/target/uberjar/*";
5252

5353
jvm_options '-DMY_PNO=#{pno}';
5454

55+
jvm_options "-Dnginx.clojure.logger.level=debug";
56+
5557
### jvm heap memory
5658
#jvm_options "-Xms1024m";
5759
#jvm_options "-Xmx1024m";
@@ -71,7 +73,7 @@ http {
7173
jvm_init_handler_name 'clojure-web-example.handler/jvm-init-handler';
7274

7375
server {
74-
listen 80;
76+
listen 8080 reuseport;
7577
server_name localhost;
7678

7779
location / {
@@ -81,7 +83,7 @@ http {
8183
## static js files although our ring hander can handle static resources
8284
## but we overwrite it here for better performance
8385
location /js {
84-
alias public/js;
86+
alias /home/who/git/nginx-clojure/example-projects/clojure-web-example/resources/public/js;
8587
}
8688

8789
## redirect server error pages to the static page /50x.html

‎example-projects/clojure-web-example/project.clj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
:description "FIXME: write description"
33
:url "https://github.com/nginx-clojure/nginx-clojure/tree/master/example-projects/clojure-web-example"
44
:min-lein-version "2.0.0"
5-
:dependencies [[org.clojure/clojure "1.7.0"] ;; v1.5.1+ is OK
5+
:dependencies [[org.clojure/clojure "1.9.0"] ;; v1.5.1+ is OK
66
[compojure "1.4.0"]
77
[ring/ring-defaults "0.1.2"]
88
[ring/ring-anti-forgery "1.0.0"]
@@ -15,11 +15,11 @@
1515
:aot [clojure-web-example.handler]
1616
:uberjar-name "clojure-web-example-default.jar"
1717
:profiles {
18-
:provided {:dependencies [[nginx-clojure "0.5.0"]]}
18+
:provided {:dependencies [[nginx-clojure "0.5.1"]]}
1919
:dev {:dependencies [[javax.servlet/servlet-api "2.5"]
2020
[ring-mock "0.1.5"]]}
2121
:embed {:dependencies
22-
[[nginx-clojure/nginx-clojure-embed "0.5.0"]]
22+
[[nginx-clojure/nginx-clojure-embed "0.5.1"]]
2323
:aot [clojure-web-example.embed-server]
2424
:main clojure-web-example.embed-server
2525
:uberjar-name "clojure-web-example-embed.jar"

‎nginx-jersey/project.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(defproject nginx-clojure/nginx-jersey "0.1.5"
1+
(defproject nginx-clojure/nginx-jersey "0.1.6"
22
:description "Intergrate Jersey into Nginx by Nignx-Clojure Module so that
33
Nginx can Support Java standard RESTful Web Services (JAX-RS)"
44
:url "https://github.com/nginx-clojure/nginx-clojure/nginx-jersey"

‎nginx-tomcat8/project.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(defproject nginx-clojure/nginx-tomcat8 "0.2.5"
1+
(defproject nginx-clojure/nginx-tomcat8 "0.2.6"
22
:description "Embed Tomcat into Nginx by Nignx-Clojure Module so that Nginx can Support Java Standard Web Applications"
33
:url "https://github.com/nginx-clojure/nginx-clojure/nginx-tomcat8"
44
:license {:name "BSD 3-Clause license"

‎test/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/target/

‎test/nginx-working-dir/conf/nginx-plain.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ http {
195195

196196

197197
server {
198-
listen 8080;
198+
listen 8080 reuseport;
199199
server_name localhost;
200200

201201
#uncomment this two lines for performance test

‎test/nginx-working-dir/testscript-notes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -573,5 +573,9 @@ lein with-profile unittest junit
573573
2. versions in project.clj
574574

575575
3. doc
576+
577+
4. sub-projects
578+
579+
5. example projects
576580

577581

0 commit comments

Comments
 (0)