]> git.pld-linux.org Git - packages/nginx.git/commitdiff
- this patch is needed to build nginx with gcc 4.6
authormarti <marti@pld-linux.org>
Wed, 24 Aug 2011 15:30:01 +0000 (15:30 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
- patch source: http://www.ruby-forum.com/attachment/6386/patch-nginx-gcc46.txt

Changed files:
    nginx-gcc46-build.patch -> 1.1

nginx-gcc46-build.patch [new file with mode: 0644]

diff --git a/nginx-gcc46-build.patch b/nginx-gcc46-build.patch
new file mode 100644 (file)
index 0000000..052aec7
--- /dev/null
@@ -0,0 +1,32 @@
+diff -ur nginx-1.0.5-orig/src/event/ngx_event_openssl.c nginx-1.0.5/src/event/ngx_event_openssl.c
+--- nginx-1.0.5-orig/src/event/ngx_event_openssl.c     2011-01-20 13:33:17.000000000 +0100
++++ nginx-1.0.5/src/event/ngx_event_openssl.c  2011-08-24 17:21:39.107319828 +0200
+@@ -1687,20 +1687,24 @@
+     ngx_int_t                 rc;
+     ngx_shm_zone_t           *shm_zone;
+     ngx_slab_pool_t          *shpool;
+-    ngx_connection_t         *c;
+-    ngx_rbtree_node_t        *node, *sentinel;
++#if (NGX_DEBUG)
++      ngx_connection_t         *c;
++#endif
++      ngx_rbtree_node_t        *node, *sentinel;
+     ngx_ssl_session_t        *sess;
+     ngx_ssl_sess_id_t        *sess_id;
+     ngx_ssl_session_cache_t  *cache;
+     u_char                    buf[NGX_SSL_MAX_SESSION_SIZE];
+-    c = ngx_ssl_get_connection(ssl_conn);
+-
+     hash = ngx_crc32_short(id, (size_t) len);
+     *copy = 0;
++#if (NGX_DEBUG)
++    c = ngx_ssl_get_connection(ssl_conn);
++
+     ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                    "ssl get session: %08XD:%d", hash, len);
++#endif
+     shm_zone = SSL_CTX_get_ex_data(SSL_get_SSL_CTX(ssl_conn),
+                                    ngx_ssl_session_cache_index);
This page took 0.20994 seconds and 4 git commands to generate.