Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nginx-push-stream-module
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
nginx-push-stream-module
Commits
a3281936
Commit
a3281936
authored
Jun 19, 2012
by
Wandenberg Peixoto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removing patches for https, is better to configure ping interval and subscriber timeout properly
parent
029daba7
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
0 additions
and
200 deletions
+0
-200
test_reading_with_ssl-nginx.0.8.5x-0.9.1.patch
patchs/test_reading_with_ssl-nginx.0.8.5x-0.9.1.patch
+0
-40
test_reading_with_ssl-nginx.0.9.2-0.9.3.patch
patchs/test_reading_with_ssl-nginx.0.9.2-0.9.3.patch
+0
-40
test_reading_with_ssl-nginx.0.9.4-1.0.5.patch
patchs/test_reading_with_ssl-nginx.0.9.4-1.0.5.patch
+0
-40
test_reading_with_ssl-nginx.1.0.6-1.1.1.patch
patchs/test_reading_with_ssl-nginx.1.0.6-1.1.1.patch
+0
-40
test_reading_with_ssl-nginx.1.1.2-1.1.4.patch
patchs/test_reading_with_ssl-nginx.1.1.2-1.1.4.patch
+0
-40
No files found.
patchs/test_reading_with_ssl-nginx.0.8.5x-0.9.1.patch
deleted
100644 → 0
View file @
029daba7
--- src/http/ngx_http_request.c 2010-07-05 10:35:20.000000000 -0300
+++ src/http/ngx_http_request.c 2011-09-25 23:44:21.053529001 -0300
@@ -2323,7 +2323,15 @@
#endif
+#if (NGX_HTTP_SSL)
+ if (c->ssl != NULL) {
+ n = SSL_peek(c->ssl->connection, buf, 1);
+ } else {
+ n = recv(c->fd, buf, 1, MSG_PEEK);
+ }
+#else
n = recv(c->fd, buf, 1, MSG_PEEK);
+#endif
if (n == 0) {
rev->eof = 1;
@@ -2333,9 +2341,19 @@
goto closed;
} else if (n == -1) {
- err = ngx_socket_errno;
+#if (NGX_HTTP_SSL)
+ if (c->ssl != NULL) {
+ err = SSL_get_error(c->ssl->connection, n);
+ } else {
+ err = ngx_socket_errno;
+ }
+
+ if ((err != NGX_EAGAIN) && (err != SSL_ERROR_WANT_READ) && (err != SSL_ERROR_WANT_WRITE)) {
+#else
+ err = ngx_socket_errno;
- if (err != NGX_EAGAIN) {
+ if (err != NGX_EAGAIN) {
+#endif
rev->eof = 1;
c->error = 1;
patchs/test_reading_with_ssl-nginx.0.9.2-0.9.3.patch
deleted
100644 → 0
View file @
029daba7
--- src/http/ngx_http_request.c 2010-12-06 09:11:05.000000000 -0200
+++ src/http/ngx_http_request.c 2011-09-30 22:44:39.395845002 -0300
@@ -2327,7 +2327,15 @@
#endif
+#if (NGX_HTTP_SSL)
+ if (c->ssl != NULL) {
+ n = SSL_peek(c->ssl->connection, buf, 1);
+ } else {
+ n = recv(c->fd, buf, 1, MSG_PEEK);
+ }
+#else
n = recv(c->fd, buf, 1, MSG_PEEK);
+#endif
if (n == 0) {
rev->eof = 1;
@@ -2337,9 +2345,19 @@
goto closed;
} else if (n == -1) {
- err = ngx_socket_errno;
+#if (NGX_HTTP_SSL)
+ if (c->ssl != NULL) {
+ err = SSL_get_error(c->ssl->connection, n);
+ } else {
+ err = ngx_socket_errno;
+ }
+
+ if ((err != NGX_EAGAIN) && (err != SSL_ERROR_WANT_READ) && (err != SSL_ERROR_WANT_WRITE)) {
+#else
+ err = ngx_socket_errno;
- if (err != NGX_EAGAIN) {
+ if (err != NGX_EAGAIN) {
+#endif
rev->eof = 1;
c->error = 1;
patchs/test_reading_with_ssl-nginx.0.9.4-1.0.5.patch
deleted
100644 → 0
View file @
029daba7
--- src/http/ngx_http_request.c 2011-01-20 08:37:58.000000000 -0200
+++ src/http/ngx_http_request.c 2011-09-30 22:55:09.935845001 -0300
@@ -2332,7 +2332,15 @@
#endif
+#if (NGX_HTTP_SSL)
+ if (c->ssl != NULL) {
+ n = SSL_peek(c->ssl->connection, buf, 1);
+ } else {
+ n = recv(c->fd, buf, 1, MSG_PEEK);
+ }
+#else
n = recv(c->fd, buf, 1, MSG_PEEK);
+#endif
if (n == 0) {
rev->eof = 1;
@@ -2342,9 +2350,19 @@
goto closed;
} else if (n == -1) {
- err = ngx_socket_errno;
+#if (NGX_HTTP_SSL)
+ if (c->ssl != NULL) {
+ err = SSL_get_error(c->ssl->connection, n);
+ } else {
+ err = ngx_socket_errno;
+ }
+
+ if ((err != NGX_EAGAIN) && (err != SSL_ERROR_WANT_READ) && (err != SSL_ERROR_WANT_WRITE)) {
+#else
+ err = ngx_socket_errno;
- if (err != NGX_EAGAIN) {
+ if (err != NGX_EAGAIN) {
+#endif
rev->eof = 1;
c->error = 1;
patchs/test_reading_with_ssl-nginx.1.0.6-1.1.1.patch
deleted
100644 → 0
View file @
029daba7
--- src/http/ngx_http_request.c 2011-08-29 09:45:03.000000000 -0300
+++ src/http/ngx_http_request.c 2011-09-30 23:59:43.265845001 -0300
@@ -2335,7 +2335,15 @@
#endif
+#if (NGX_HTTP_SSL)
+ if (c->ssl != NULL) {
+ n = SSL_peek(c->ssl->connection, buf, 1);
+ } else {
+ n = recv(c->fd, buf, 1, MSG_PEEK);
+ }
+#else
n = recv(c->fd, buf, 1, MSG_PEEK);
+#endif
if (n == 0) {
rev->eof = 1;
@@ -2345,9 +2353,19 @@
goto closed;
} else if (n == -1) {
- err = ngx_socket_errno;
+#if (NGX_HTTP_SSL)
+ if (c->ssl != NULL) {
+ err = SSL_get_error(c->ssl->connection, n);
+ } else {
+ err = ngx_socket_errno;
+ }
+
+ if ((err != NGX_EAGAIN) && (err != SSL_ERROR_WANT_READ) && (err != SSL_ERROR_WANT_WRITE)) {
+#else
+ err = ngx_socket_errno;
- if (err != NGX_EAGAIN) {
+ if (err != NGX_EAGAIN) {
+#endif
rev->eof = 1;
c->error = 1;
patchs/test_reading_with_ssl-nginx.1.1.2-1.1.4.patch
deleted
100644 → 0
View file @
029daba7
--- src/http/ngx_http_request.c 2011-10-01 00:27:17.895845001 -0300
+++ src/http/ngx_http_request.c 2011-10-01 00:15:46.055845002 -0300
@@ -2353,7 +2353,15 @@
#endif
+#if (NGX_HTTP_SSL)
+ if (c->ssl != NULL) {
+ n = SSL_peek(c->ssl->connection, buf, 1);
+ } else {
+ n = recv(c->fd, buf, 1, MSG_PEEK);
+ }
+#else
n = recv(c->fd, buf, 1, MSG_PEEK);
+#endif
if (n == 0) {
rev->eof = 1;
@@ -2363,9 +2371,19 @@
goto closed;
} else if (n == -1) {
- err = ngx_socket_errno;
+#if (NGX_HTTP_SSL)
+ if (c->ssl != NULL) {
+ err = SSL_get_error(c->ssl->connection, n);
+ } else {
+ err = ngx_socket_errno;
+ }
+
+ if ((err != NGX_EAGAIN) && (err != SSL_ERROR_WANT_READ) && (err != SSL_ERROR_WANT_WRITE)) {
+#else
+ err = ngx_socket_errno;
- if (err != NGX_EAGAIN) {
+ if (err != NGX_EAGAIN) {
+#endif
rev->eof = 1;
c->error = 1;
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment