Skip to content

Commit e633e75

Browse files
committed
Merge branch 'master' of github.com:chaoslawful/lua-nginx-module
2 parents fc7893d + 60e70ef commit e633e75

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ if [ $ngx_found = yes ]; then
159159
fi
160160

161161
USE_MD5=YES
162+
USE_SHA1=YES
162163

163164
#CFLAGS=$"$CFLAGS -DLUA_DEFAULT_PATH='\"/usr/local/openresty/lualib/?.lua\"'"
164165
#CFLAGS=$"$CFLAGS -DLUA_DEFAULT_CPATH='\"/usr/local/openresty/lualib/?.so\"'"

src/ngx_http_lua_util.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1249,18 +1249,10 @@ ngx_http_lua_dump_postponed(ngx_http_request_t *r)
12491249

12501250
ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
12511251
"postponed request for %V: "
1252-
1253-
#if defined(nginx_version) && nginx_version >= 8011
12541252
"c:%d, "
1255-
#endif
1256-
12571253
"a:%d, i:%d, r:%V, out:%V",
12581254
&r->uri,
1259-
1260-
#if defined(nginx_version) && nginx_version >= 8011
12611255
r->main->count,
1262-
#endif
1263-
12641256
r == r->connection->data, i,
12651257
pr->request ? &pr->request->uri : &nil_str, &out);
12661258
}

0 commit comments

Comments
 (0)