[PATCH] Proxy: added the "proxy_ssl_ciphers" directive.

[Maxim Dounin]

Hello!

On Mon, Sep 23, 2013 at 03:59:37PM -0700, Piotr Sikora wrote:

> # HG changeset patch
> # User Piotr Sikora <piotr at cloudflare.com>
> # Date 1379977108 25200
> #      Mon Sep 23 15:58:28 2013 -0700
> # Node ID 80ae4ce8a7a08393e09458cf74cc4f469218679f
> # Parent  72e31d88defadc94a17ce208c487aac98632e8f2
> Proxy: added the "proxy_ssl_ciphers" directive.
> 
> Signed-off-by: Piotr Sikora <piotr at cloudflare.com>
> 
> diff -r 72e31d88defa -r 80ae4ce8a7a0 src/http/modules/ngx_http_proxy_module.c
> --- a/src/http/modules/ngx_http_proxy_module.c  Mon Sep 23 19:37:13 2013 +0400
> +++ b/src/http/modules/ngx_http_proxy_module.c  Mon Sep 23 15:58:28 2013 -0700
> @@ -10,6 +10,9 @@
>  #include <ngx_http.h>
> 
> 
> +#define NGX_DEFAULT_CIPHERS  "DEFAULT"
> +
> +

I tend to think it would be better to omit this for clarity, and 
just use the "DEFAULT" string constant in 
ngx_conf_merge_str_value():

--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -10,9 +10,6 @@
 #include <ngx_http.h>
 
 
-#define NGX_DEFAULT_CIPHERS  "DEFAULT"
-
-
 typedef struct ngx_http_proxy_rewrite_s  ngx_http_proxy_rewrite_t;
 
 typedef ngx_int_t (*ngx_http_proxy_rewrite_pt)(ngx_http_request_t *r,
@@ -2748,7 +2745,7 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t
                                   |NGX_SSL_TLSv1_2));
 
     ngx_conf_merge_str_value(conf->ssl_ciphers, prev->ssl_ciphers,
-                             NGX_DEFAULT_CIPHERS);
+                             "DEFAULT");
 
     if (conf->ssl && ngx_http_proxy_set_ssl(cf, conf) != NGX_OK) {
         return NGX_CONF_ERROR;


You are ok with this?  If yes, I'll just push the fixed version.

-- 
Maxim Dounin
http://nginx.org/en/donation.html