Welcome! Log In Create A New Profile

Advanced

[nginx] svn commit: r4523 - in trunk/src: core event http http/modules mail os/unix

Anonymous User
March 05, 2012 01:10PM
Author: mdounin
Date: 2012-03-05 18:09:06 +0000 (Mon, 05 Mar 2012)
New Revision: 4523

Log:
Whitespace fixes.


Modified:
trunk/src/core/ngx_connection.c
trunk/src/event/ngx_event_openssl.c
trunk/src/http/modules/ngx_http_fastcgi_module.c
trunk/src/http/modules/ngx_http_scgi_module.c
trunk/src/http/modules/ngx_http_uwsgi_module.c
trunk/src/http/ngx_http_busy_lock.c
trunk/src/http/ngx_http_core_module.c
trunk/src/mail/ngx_mail_core_module.c
trunk/src/os/unix/ngx_process.c

Modified: trunk/src/core/ngx_connection.c
===================================================================
--- trunk/src/core/ngx_connection.c 2012-03-05 18:08:23 UTC (rev 4522)
+++ trunk/src/core/ngx_connection.c 2012-03-05 18:09:06 UTC (rev 4523)
@@ -514,7 +514,7 @@
}
}

-#if (NGX_HAVE_KEEPALIVE_TUNABLE)
+#if (NGX_HAVE_KEEPALIVE_TUNABLE)

if (ls[i].keepidle) {
if (setsockopt(ls[i].fd, IPPROTO_TCP, TCP_KEEPIDLE,

Modified: trunk/src/event/ngx_event_openssl.c
===================================================================
--- trunk/src/event/ngx_event_openssl.c 2012-03-05 18:08:23 UTC (rev 4522)
+++ trunk/src/event/ngx_event_openssl.c 2012-03-05 18:09:06 UTC (rev 4523)
@@ -478,6 +478,7 @@
return NGX_OK;
}

+
ngx_int_t
ngx_ssl_ecdh_curve(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *name)
{
@@ -518,6 +519,7 @@
return NGX_OK;
}

+
ngx_int_t
ngx_ssl_create_connection(ngx_ssl_t *ssl, ngx_connection_t *c, ngx_uint_t flags)
{

Modified: trunk/src/http/modules/ngx_http_fastcgi_module.c
===================================================================
--- trunk/src/http/modules/ngx_http_fastcgi_module.c 2012-03-05 18:08:23 UTC (rev 4522)
+++ trunk/src/http/modules/ngx_http_fastcgi_module.c 2012-03-05 18:09:06 UTC (rev 4523)
@@ -2432,7 +2432,8 @@

if (prev->headers_hash.buckets
#if (NGX_HTTP_CACHE)
- && ((conf->upstream.cache == NULL) == (prev->upstream.cache == NULL))
+ && ((conf->upstream.cache == NULL)
+ == (prev->upstream.cache == NULL))
#endif
)
{

Modified: trunk/src/http/modules/ngx_http_scgi_module.c
===================================================================
--- trunk/src/http/modules/ngx_http_scgi_module.c 2012-03-05 18:08:23 UTC (rev 4522)
+++ trunk/src/http/modules/ngx_http_scgi_module.c 2012-03-05 18:09:06 UTC (rev 4523)
@@ -1384,7 +1384,8 @@

if (prev->headers_hash.buckets
#if (NGX_HTTP_CACHE)
- && ((conf->upstream.cache == NULL) == (prev->upstream.cache == NULL))
+ && ((conf->upstream.cache == NULL)
+ == (prev->upstream.cache == NULL))
#endif
)
{

Modified: trunk/src/http/modules/ngx_http_uwsgi_module.c
===================================================================
--- trunk/src/http/modules/ngx_http_uwsgi_module.c 2012-03-05 18:08:23 UTC (rev 4522)
+++ trunk/src/http/modules/ngx_http_uwsgi_module.c 2012-03-05 18:09:06 UTC (rev 4523)
@@ -1441,7 +1441,8 @@

if (prev->headers_hash.buckets
#if (NGX_HTTP_CACHE)
- && ((conf->upstream.cache == NULL) == (prev->upstream.cache == NULL))
+ && ((conf->upstream.cache == NULL)
+ == (prev->upstream.cache == NULL))
#endif
)
{

Modified: trunk/src/http/ngx_http_busy_lock.c
===================================================================
--- trunk/src/http/ngx_http_busy_lock.c 2012-03-05 18:08:23 UTC (rev 4522)
+++ trunk/src/http/ngx_http_busy_lock.c 2012-03-05 18:09:06 UTC (rev 4523)
@@ -300,7 +300,7 @@

if (bl->timeout == 0 && bl->max_waiting) {
ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
- "busy lock waiting is useless with zero timeout, ignoring");
+ "busy lock waiting is useless with zero timeout, ignoring");
}

return NGX_CONF_OK;

Modified: trunk/src/http/ngx_http_core_module.c
===================================================================
--- trunk/src/http/ngx_http_core_module.c 2012-03-05 18:08:23 UTC (rev 4522)
+++ trunk/src/http/ngx_http_core_module.c 2012-03-05 18:09:06 UTC (rev 4523)
@@ -3970,7 +3970,7 @@
}
}

- if (lsopt.tcp_keepidle == 0 && lsopt.tcp_keepintvl == 0
+ if (lsopt.tcp_keepidle == 0 && lsopt.tcp_keepintvl == 0
&& lsopt.tcp_keepcnt == 0)
{
goto invalid_so_keepalive;
@@ -4629,7 +4629,7 @@

if (max == 0) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
- "\"open_file_cache\" must have the \"max\" parameter");
+ "\"open_file_cache\" must have the \"max\" parameter");
return NGX_CONF_ERROR;
}


Modified: trunk/src/mail/ngx_mail_core_module.c
===================================================================
--- trunk/src/mail/ngx_mail_core_module.c 2012-03-05 18:08:23 UTC (rev 4522)
+++ trunk/src/mail/ngx_mail_core_module.c 2012-03-05 18:09:06 UTC (rev 4523)
@@ -26,7 +26,7 @@


static ngx_conf_deprecated_t ngx_conf_deprecated_so_keepalive = {
- ngx_conf_deprecated, "so_keepalive",
+ ngx_conf_deprecated, "so_keepalive",
"so_keepalive\" parameter of the \"listen"
};


Modified: trunk/src/os/unix/ngx_process.c
===================================================================
--- trunk/src/os/unix/ngx_process.c 2012-03-05 18:08:23 UTC (rev 4522)
+++ trunk/src/os/unix/ngx_process.c 2012-03-05 18:09:06 UTC (rev 4523)
@@ -544,7 +544,7 @@

static void
ngx_unlock_mutexes(ngx_pid_t pid)
-{
+{
ngx_uint_t i;
ngx_shm_zone_t *shm_zone;
ngx_list_part_t *part;

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel
Subject Author Views Posted

[nginx] svn commit: r4523 - in trunk/src: core event http http/modules mail os/unix

Anonymous User 970 March 05, 2012 01:10PM



Sorry, you do not have permission to post/reply in this forum.

Online Users

Guests: 75
Record Number of Users: 6 on February 13, 2018
Record Number of Guests: 421 on December 02, 2018
Powered by nginx      Powered by FreeBSD      PHP Powered      Powered by MariaDB      ipv6 ready