add no_padding option to ngx_http_lua_ffi_encode_base64

Shuxin Yang · Shuxin Yang · commit e7a7079cbf39 · 2015-03-17T14:03:28.000-07:00
diff --git a/src/ngx_http_lua_string.c b/src/ngx_http_lua_string.c
@@ -700,7 +700,8 @@ ngx_http_lua_ffi_sha1_bin(const u_char *src, size_t len, u_char *dst)
 
 
 size_t
-ngx_http_lua_ffi_encode_base64(const u_char *src, size_t slen, u_char *dst)
+ngx_http_lua_ffi_encode_base64(const u_char *src, size_t slen, u_char *dst,
+    int no_padding)
 {
     ngx_str_t      in, out;
 
@@ -709,7 +710,7 @@ ngx_http_lua_ffi_encode_base64(const u_char *src, size_t slen, u_char *dst)
 
     out.data = dst;
 
-    ngx_encode_base64(&out, &in);
+    ngx_http_lua_encode_base64(&out, &in, no_padding);
 
     return out.len;
 }

Original file line number	Diff line number	Diff line change
`@@ -700,7 +700,8 @@ ngx_http_lua_ffi_sha1_bin(const u_char src, size_t len, u_char dst)`
`700`	`700`
`701`	`701`
`702`	`702`	`size_t`
`703`		`-ngx_http_lua_ffi_encode_base64(const u_char src, size_t slen, u_char dst)`
	`703`	`+ngx_http_lua_ffi_encode_base64(const u_char src, size_t slen, u_char dst,`
	`704`	`+ int no_padding)`
`704`	`705`	`{`
`705`	`706`	`ngx_str_t in, out;`
`706`	`707`
`@@ -709,7 +710,7 @@ ngx_http_lua_ffi_encode_base64(const u_char src, size_t slen, u_char dst)`
`709`	`710`
`710`	`711`	`out.data = dst;`
`711`	`712`
`712`		`- ngx_encode_base64(&out, &in);`
	`713`	`+ ngx_http_lua_encode_base64(&out, &in, no_padding);`
`713`	`714`
`714`	`715`	`return out.len;`
`715`	`716`	`}`