Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fixed NDK issues, USE_OPENSSL also enables the ssl support in the ngi…

…nx core, which is unacceptable.
  • Loading branch information...
commit 52624bf3a60c85b4aa01207d04e4a6053b7c0d7d 1 parent fb290d1
@agentzh agentzh authored
View
4 config
@@ -2,10 +2,10 @@ ngx_addon_name=ngx_http_set_misc_module
HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_set_misc_module"
NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/src/ngx_http_set_base32.c $ngx_addon_dir/src/ngx_http_set_default_value.c $ngx_addon_dir/src/ngx_http_set_hashed_upstream.c $ngx_addon_dir/src/ngx_http_set_quote_sql.c $ngx_addon_dir/src/ngx_http_set_quote_json.c $ngx_addon_dir/src/ngx_http_set_unescape_uri.c $ngx_addon_dir/src/ngx_http_set_misc_module.c $ngx_addon_dir/src/ngx_http_set_escape_uri.c $ngx_addon_dir/src/ngx_http_set_hash.c $ngx_addon_dir/src/ngx_http_set_local_today.c"
NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_addon_dir/src/ddebug.h $ngx_addon_dir/src/ngx_http_set_default_value.h $ngx_addon_dir/src/ngx_http_set_hashed_upstream.h $ngx_addon_dir/src/ngx_http_set_quote_sql.h $ngx_addon_dir/src/ngx_http_set_quote_json.h $ngx_addon_dir/src/ngx_http_set_unescape_uri.h $ngx_addon_dir/src/ngx_http_set_escape_uri.h $ngx_addon_dir/src/ngx_http_set_hash.h $ngx_addon_dir/src/ngx_http_set_local_today.h"
+CFLAGS="$CFLAGS -DNDK_SET_VAR -DNGX_OPENSSL_MD5 -DNGX_HAVE_OPENSSL_MD5_H -DNGX_HAVE_OPENSSL_SHA1_H -DNDK_SET_VAR -DNDK_HASH -DNDK_SHA1 -DNDK_MD5"
have=NDK_HASH . auto/have
have=NDK_UPSTREAM_LIST . auto/have
-USE_OPENSSL=YES
USE_MD5=YES
-USE_SHA1=YES
+USE_SHA1=YES
View
3  test/t/default-value.t
@@ -84,7 +84,6 @@ buggy?
--- request
GET /foo?bar=71
--- response_body
-15
+71
25
-
View
1  test/t/quote-json.t
@@ -28,6 +28,7 @@ GET /foo
"hello\n\r'\"\\"
+
=== TEST 2: set quote json value (in place)
--- config
location /foo {
View
26 test/valgrind.suppress
@@ -21,3 +21,29 @@
epoll_ctl(event)
fun:epoll_ctl
}
+{
+ <insert_a_suppression_name_here>
+ Memcheck:Leak
+ fun:malloc
+ fun:CRYPTO_malloc
+ fun:lh_insert
+ obj:/lib64/libcrypto.so.0.9.8
+ fun:ERR_load_strings
+ fun:ngx_ssl_init
+ fun:main
+}
+{
+ <insert_a_suppression_name_here>
+ Memcheck:Leak
+ fun:malloc
+ fun:CRYPTO_malloc
+ fun:lh_insert
+ obj:/lib64/libcrypto.so.0.9.8
+ fun:ERR_load_strings
+ fun:ERR_load_OCSP_strings
+ fun:ERR_load_crypto_strings
+ fun:SSL_load_error_strings
+ fun:ngx_ssl_init
+ fun:main
+}
+
Please sign in to comment.
Something went wrong with that request. Please try again.