mirror of
https://github.com/openresty/openresty.git
synced 2024-10-13 00:29:41 +00:00
Compare commits
8 Commits
476b640fbb
...
v1.27.1.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8c37412c31 | ||
|
|
c41a1ae6b9 | ||
|
|
120ad62721 | ||
|
|
5ef14281cd | ||
|
|
efc930249e | ||
|
|
c58d90ce11 | ||
|
|
27303d2fd0 | ||
|
|
347c47c784 |
81
patches/nginx-1.19.3-proc_exit_handler.patch
Normal file
81
patches/nginx-1.19.3-proc_exit_handler.patch
Normal file
@@ -0,0 +1,81 @@
|
||||
commit 29cafd35fb2b7cff759fb4c9b84fa4600875321f
|
||||
Author: lijunlong <lijunlong@openresty.com>
|
||||
Date: Sun Apr 11 14:34:47 2021 +0800
|
||||
|
||||
feature: added a process exit callback point.
|
||||
|
||||
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
|
||||
index d7479fa4..c421e43c 100644
|
||||
--- a/src/core/ngx_cycle.c
|
||||
+++ b/src/core/ngx_cycle.c
|
||||
@@ -255,6 +255,7 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
|
||||
}
|
||||
|
||||
|
||||
+ ngx_proc_exit_top_handler = ngx_proc_exit_def_handler;
|
||||
conf.ctx = cycle->conf_ctx;
|
||||
conf.cycle = cycle;
|
||||
conf.pool = pool;
|
||||
diff --git a/src/os/unix/ngx_process.c b/src/os/unix/ngx_process.c
|
||||
index 15680237..9d2e81c5 100644
|
||||
--- a/src/os/unix/ngx_process.c
|
||||
+++ b/src/os/unix/ngx_process.c
|
||||
@@ -34,6 +34,7 @@ ngx_int_t ngx_process_slot;
|
||||
ngx_socket_t ngx_channel;
|
||||
ngx_int_t ngx_last_process;
|
||||
ngx_process_t ngx_processes[NGX_MAX_PROCESSES];
|
||||
+ngx_proc_exit_pt ngx_proc_exit_top_handler;
|
||||
|
||||
|
||||
ngx_signal_t signals[] = {
|
||||
@@ -83,6 +84,13 @@ ngx_signal_t signals[] = {
|
||||
};
|
||||
|
||||
|
||||
+void
|
||||
+ngx_proc_exit_def_handler(ngx_pid_t pid)
|
||||
+{
|
||||
+ /* do nothing */
|
||||
+}
|
||||
+
|
||||
+
|
||||
ngx_pid_t
|
||||
ngx_spawn_process(ngx_cycle_t *cycle, ngx_spawn_proc_pt proc, void *data,
|
||||
char *name, ngx_int_t respawn)
|
||||
@@ -557,6 +565,7 @@ ngx_process_get_status(void)
|
||||
}
|
||||
|
||||
ngx_unlock_mutexes(pid);
|
||||
+ ngx_proc_exit_top_handler(pid);
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/src/os/unix/ngx_process.h b/src/os/unix/ngx_process.h
|
||||
index 3986639b..c5972541 100644
|
||||
--- a/src/os/unix/ngx_process.h
|
||||
+++ b/src/os/unix/ngx_process.h
|
||||
@@ -18,6 +18,8 @@ typedef pid_t ngx_pid_t;
|
||||
#define NGX_INVALID_PID -1
|
||||
|
||||
typedef void (*ngx_spawn_proc_pt) (ngx_cycle_t *cycle, void *data);
|
||||
+#define NGX_HAVE_PROC_EXIT 1
|
||||
+typedef void (*ngx_proc_exit_pt)(ngx_pid_t pid);
|
||||
|
||||
typedef struct {
|
||||
ngx_pid_t pid;
|
||||
@@ -66,6 +67,7 @@ ngx_pid_t ngx_spawn_process(ngx_cycle_t *cycle,
|
||||
ngx_pid_t ngx_execute(ngx_cycle_t *cycle, ngx_exec_ctx_t *ctx);
|
||||
ngx_int_t ngx_init_signals(ngx_log_t *log);
|
||||
void ngx_debug_point(void);
|
||||
+void ngx_proc_exit_def_handler(ngx_pid_t pid);
|
||||
|
||||
|
||||
#if (NGX_HAVE_SCHED_YIELD)
|
||||
@@ -85,6 +87,7 @@ extern ngx_socket_t ngx_channel;
|
||||
extern ngx_int_t ngx_process_slot;
|
||||
extern ngx_int_t ngx_last_process;
|
||||
extern ngx_process_t ngx_processes[NGX_MAX_PROCESSES];
|
||||
+extern ngx_proc_exit_pt ngx_proc_exit_top_handler;
|
||||
|
||||
|
||||
#endif /* _NGX_PROCESS_H_INCLUDED_ */
|
||||
81
patches/nginx-1.19.9-proc_exit_handler.patch
Normal file
81
patches/nginx-1.19.9-proc_exit_handler.patch
Normal file
@@ -0,0 +1,81 @@
|
||||
commit 29cafd35fb2b7cff759fb4c9b84fa4600875321f
|
||||
Author: lijunlong <lijunlong@openresty.com>
|
||||
Date: Sun Apr 11 14:34:47 2021 +0800
|
||||
|
||||
feature: added a process exit callback point.
|
||||
|
||||
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
|
||||
index d7479fa4..c421e43c 100644
|
||||
--- a/src/core/ngx_cycle.c
|
||||
+++ b/src/core/ngx_cycle.c
|
||||
@@ -255,6 +255,7 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
|
||||
}
|
||||
|
||||
|
||||
+ ngx_proc_exit_top_handler = ngx_proc_exit_def_handler;
|
||||
conf.ctx = cycle->conf_ctx;
|
||||
conf.cycle = cycle;
|
||||
conf.pool = pool;
|
||||
diff --git a/src/os/unix/ngx_process.c b/src/os/unix/ngx_process.c
|
||||
index 15680237..9d2e81c5 100644
|
||||
--- a/src/os/unix/ngx_process.c
|
||||
+++ b/src/os/unix/ngx_process.c
|
||||
@@ -34,6 +34,7 @@ ngx_int_t ngx_process_slot;
|
||||
ngx_socket_t ngx_channel;
|
||||
ngx_int_t ngx_last_process;
|
||||
ngx_process_t ngx_processes[NGX_MAX_PROCESSES];
|
||||
+ngx_proc_exit_pt ngx_proc_exit_top_handler;
|
||||
|
||||
|
||||
ngx_signal_t signals[] = {
|
||||
@@ -83,6 +84,13 @@ ngx_signal_t signals[] = {
|
||||
};
|
||||
|
||||
|
||||
+void
|
||||
+ngx_proc_exit_def_handler(ngx_pid_t pid)
|
||||
+{
|
||||
+ /* do nothing */
|
||||
+}
|
||||
+
|
||||
+
|
||||
ngx_pid_t
|
||||
ngx_spawn_process(ngx_cycle_t *cycle, ngx_spawn_proc_pt proc, void *data,
|
||||
char *name, ngx_int_t respawn)
|
||||
@@ -557,6 +565,7 @@ ngx_process_get_status(void)
|
||||
}
|
||||
|
||||
ngx_unlock_mutexes(pid);
|
||||
+ ngx_proc_exit_top_handler(pid);
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/src/os/unix/ngx_process.h b/src/os/unix/ngx_process.h
|
||||
index 3986639b..c5972541 100644
|
||||
--- a/src/os/unix/ngx_process.h
|
||||
+++ b/src/os/unix/ngx_process.h
|
||||
@@ -18,6 +18,8 @@ typedef pid_t ngx_pid_t;
|
||||
#define NGX_INVALID_PID -1
|
||||
|
||||
typedef void (*ngx_spawn_proc_pt) (ngx_cycle_t *cycle, void *data);
|
||||
+#define NGX_HAVE_PROC_EXIT 1
|
||||
+typedef void (*ngx_proc_exit_pt)(ngx_pid_t pid);
|
||||
|
||||
typedef struct {
|
||||
ngx_pid_t pid;
|
||||
@@ -66,6 +67,7 @@ ngx_pid_t ngx_spawn_process(ngx_cycle_t *cycle,
|
||||
ngx_pid_t ngx_execute(ngx_cycle_t *cycle, ngx_exec_ctx_t *ctx);
|
||||
ngx_int_t ngx_init_signals(ngx_log_t *log);
|
||||
void ngx_debug_point(void);
|
||||
+void ngx_proc_exit_def_handler(ngx_pid_t pid);
|
||||
|
||||
|
||||
#if (NGX_HAVE_SCHED_YIELD)
|
||||
@@ -85,6 +87,7 @@ extern ngx_socket_t ngx_channel;
|
||||
extern ngx_int_t ngx_process_slot;
|
||||
extern ngx_int_t ngx_last_process;
|
||||
extern ngx_process_t ngx_processes[NGX_MAX_PROCESSES];
|
||||
+extern ngx_proc_exit_pt ngx_proc_exit_top_handler;
|
||||
|
||||
|
||||
#endif /* _NGX_PROCESS_H_INCLUDED_ */
|
||||
81
patches/nginx-1.21.3-proc_exit_handler.patch
Normal file
81
patches/nginx-1.21.3-proc_exit_handler.patch
Normal file
@@ -0,0 +1,81 @@
|
||||
commit 29cafd35fb2b7cff759fb4c9b84fa4600875321f
|
||||
Author: lijunlong <lijunlong@openresty.com>
|
||||
Date: Sun Apr 11 14:34:47 2021 +0800
|
||||
|
||||
feature: added a process exit callback point.
|
||||
|
||||
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
|
||||
index d7479fa4..c421e43c 100644
|
||||
--- a/src/core/ngx_cycle.c
|
||||
+++ b/src/core/ngx_cycle.c
|
||||
@@ -255,6 +255,7 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
|
||||
}
|
||||
|
||||
|
||||
+ ngx_proc_exit_top_handler = ngx_proc_exit_def_handler;
|
||||
conf.ctx = cycle->conf_ctx;
|
||||
conf.cycle = cycle;
|
||||
conf.pool = pool;
|
||||
diff --git a/src/os/unix/ngx_process.c b/src/os/unix/ngx_process.c
|
||||
index 15680237..9d2e81c5 100644
|
||||
--- a/src/os/unix/ngx_process.c
|
||||
+++ b/src/os/unix/ngx_process.c
|
||||
@@ -34,6 +34,7 @@ ngx_int_t ngx_process_slot;
|
||||
ngx_socket_t ngx_channel;
|
||||
ngx_int_t ngx_last_process;
|
||||
ngx_process_t ngx_processes[NGX_MAX_PROCESSES];
|
||||
+ngx_proc_exit_pt ngx_proc_exit_top_handler;
|
||||
|
||||
|
||||
ngx_signal_t signals[] = {
|
||||
@@ -83,6 +84,13 @@ ngx_signal_t signals[] = {
|
||||
};
|
||||
|
||||
|
||||
+void
|
||||
+ngx_proc_exit_def_handler(ngx_pid_t pid)
|
||||
+{
|
||||
+ /* do nothing */
|
||||
+}
|
||||
+
|
||||
+
|
||||
ngx_pid_t
|
||||
ngx_spawn_process(ngx_cycle_t *cycle, ngx_spawn_proc_pt proc, void *data,
|
||||
char *name, ngx_int_t respawn)
|
||||
@@ -557,6 +565,7 @@ ngx_process_get_status(void)
|
||||
}
|
||||
|
||||
ngx_unlock_mutexes(pid);
|
||||
+ ngx_proc_exit_top_handler(pid);
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/src/os/unix/ngx_process.h b/src/os/unix/ngx_process.h
|
||||
index 3986639b..c5972541 100644
|
||||
--- a/src/os/unix/ngx_process.h
|
||||
+++ b/src/os/unix/ngx_process.h
|
||||
@@ -18,6 +18,8 @@ typedef pid_t ngx_pid_t;
|
||||
#define NGX_INVALID_PID -1
|
||||
|
||||
typedef void (*ngx_spawn_proc_pt) (ngx_cycle_t *cycle, void *data);
|
||||
+#define NGX_HAVE_PROC_EXIT 1
|
||||
+typedef void (*ngx_proc_exit_pt)(ngx_pid_t pid);
|
||||
|
||||
typedef struct {
|
||||
ngx_pid_t pid;
|
||||
@@ -66,6 +67,7 @@ ngx_pid_t ngx_spawn_process(ngx_cycle_t *cycle,
|
||||
ngx_pid_t ngx_execute(ngx_cycle_t *cycle, ngx_exec_ctx_t *ctx);
|
||||
ngx_int_t ngx_init_signals(ngx_log_t *log);
|
||||
void ngx_debug_point(void);
|
||||
+void ngx_proc_exit_def_handler(ngx_pid_t pid);
|
||||
|
||||
|
||||
#if (NGX_HAVE_SCHED_YIELD)
|
||||
@@ -85,6 +87,7 @@ extern ngx_socket_t ngx_channel;
|
||||
extern ngx_int_t ngx_process_slot;
|
||||
extern ngx_int_t ngx_last_process;
|
||||
extern ngx_process_t ngx_processes[NGX_MAX_PROCESSES];
|
||||
+extern ngx_proc_exit_pt ngx_proc_exit_top_handler;
|
||||
|
||||
|
||||
#endif /* _NGX_PROCESS_H_INCLUDED_ */
|
||||
81
patches/nginx-1.21.4-proc_exit_handler.patch
Normal file
81
patches/nginx-1.21.4-proc_exit_handler.patch
Normal file
@@ -0,0 +1,81 @@
|
||||
commit 29cafd35fb2b7cff759fb4c9b84fa4600875321f
|
||||
Author: lijunlong <lijunlong@openresty.com>
|
||||
Date: Sun Apr 11 14:34:47 2021 +0800
|
||||
|
||||
feature: added a process exit callback point.
|
||||
|
||||
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
|
||||
index d7479fa4..c421e43c 100644
|
||||
--- a/src/core/ngx_cycle.c
|
||||
+++ b/src/core/ngx_cycle.c
|
||||
@@ -255,6 +255,7 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
|
||||
}
|
||||
|
||||
|
||||
+ ngx_proc_exit_top_handler = ngx_proc_exit_def_handler;
|
||||
conf.ctx = cycle->conf_ctx;
|
||||
conf.cycle = cycle;
|
||||
conf.pool = pool;
|
||||
diff --git a/src/os/unix/ngx_process.c b/src/os/unix/ngx_process.c
|
||||
index 15680237..9d2e81c5 100644
|
||||
--- a/src/os/unix/ngx_process.c
|
||||
+++ b/src/os/unix/ngx_process.c
|
||||
@@ -34,6 +34,7 @@ ngx_int_t ngx_process_slot;
|
||||
ngx_socket_t ngx_channel;
|
||||
ngx_int_t ngx_last_process;
|
||||
ngx_process_t ngx_processes[NGX_MAX_PROCESSES];
|
||||
+ngx_proc_exit_pt ngx_proc_exit_top_handler;
|
||||
|
||||
|
||||
ngx_signal_t signals[] = {
|
||||
@@ -83,6 +84,13 @@ ngx_signal_t signals[] = {
|
||||
};
|
||||
|
||||
|
||||
+void
|
||||
+ngx_proc_exit_def_handler(ngx_pid_t pid)
|
||||
+{
|
||||
+ /* do nothing */
|
||||
+}
|
||||
+
|
||||
+
|
||||
ngx_pid_t
|
||||
ngx_spawn_process(ngx_cycle_t *cycle, ngx_spawn_proc_pt proc, void *data,
|
||||
char *name, ngx_int_t respawn)
|
||||
@@ -557,6 +565,7 @@ ngx_process_get_status(void)
|
||||
}
|
||||
|
||||
ngx_unlock_mutexes(pid);
|
||||
+ ngx_proc_exit_top_handler(pid);
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/src/os/unix/ngx_process.h b/src/os/unix/ngx_process.h
|
||||
index 3986639b..c5972541 100644
|
||||
--- a/src/os/unix/ngx_process.h
|
||||
+++ b/src/os/unix/ngx_process.h
|
||||
@@ -18,6 +18,8 @@ typedef pid_t ngx_pid_t;
|
||||
#define NGX_INVALID_PID -1
|
||||
|
||||
typedef void (*ngx_spawn_proc_pt) (ngx_cycle_t *cycle, void *data);
|
||||
+#define NGX_HAVE_PROC_EXIT 1
|
||||
+typedef void (*ngx_proc_exit_pt)(ngx_pid_t pid);
|
||||
|
||||
typedef struct {
|
||||
ngx_pid_t pid;
|
||||
@@ -66,6 +67,7 @@ ngx_pid_t ngx_spawn_process(ngx_cycle_t *cycle,
|
||||
ngx_pid_t ngx_execute(ngx_cycle_t *cycle, ngx_exec_ctx_t *ctx);
|
||||
ngx_int_t ngx_init_signals(ngx_log_t *log);
|
||||
void ngx_debug_point(void);
|
||||
+void ngx_proc_exit_def_handler(ngx_pid_t pid);
|
||||
|
||||
|
||||
#if (NGX_HAVE_SCHED_YIELD)
|
||||
@@ -85,6 +87,7 @@ extern ngx_socket_t ngx_channel;
|
||||
extern ngx_int_t ngx_process_slot;
|
||||
extern ngx_int_t ngx_last_process;
|
||||
extern ngx_process_t ngx_processes[NGX_MAX_PROCESSES];
|
||||
+extern ngx_proc_exit_pt ngx_proc_exit_top_handler;
|
||||
|
||||
|
||||
#endif /* _NGX_PROCESS_H_INCLUDED_ */
|
||||
81
patches/nginx-1.25.3-proc_exit_handler.patch
Normal file
81
patches/nginx-1.25.3-proc_exit_handler.patch
Normal file
@@ -0,0 +1,81 @@
|
||||
commit 29cafd35fb2b7cff759fb4c9b84fa4600875321f
|
||||
Author: lijunlong <lijunlong@openresty.com>
|
||||
Date: Sun Apr 11 14:34:47 2021 +0800
|
||||
|
||||
feature: added a process exit callback point.
|
||||
|
||||
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
|
||||
index d7479fa4..c421e43c 100644
|
||||
--- a/src/core/ngx_cycle.c
|
||||
+++ b/src/core/ngx_cycle.c
|
||||
@@ -255,6 +255,7 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
|
||||
}
|
||||
|
||||
|
||||
+ ngx_proc_exit_top_handler = ngx_proc_exit_def_handler;
|
||||
conf.ctx = cycle->conf_ctx;
|
||||
conf.cycle = cycle;
|
||||
conf.pool = pool;
|
||||
diff --git a/src/os/unix/ngx_process.c b/src/os/unix/ngx_process.c
|
||||
index 15680237..9d2e81c5 100644
|
||||
--- a/src/os/unix/ngx_process.c
|
||||
+++ b/src/os/unix/ngx_process.c
|
||||
@@ -34,6 +34,7 @@ ngx_int_t ngx_process_slot;
|
||||
ngx_socket_t ngx_channel;
|
||||
ngx_int_t ngx_last_process;
|
||||
ngx_process_t ngx_processes[NGX_MAX_PROCESSES];
|
||||
+ngx_proc_exit_pt ngx_proc_exit_top_handler;
|
||||
|
||||
|
||||
ngx_signal_t signals[] = {
|
||||
@@ -83,6 +84,13 @@ ngx_signal_t signals[] = {
|
||||
};
|
||||
|
||||
|
||||
+void
|
||||
+ngx_proc_exit_def_handler(ngx_pid_t pid)
|
||||
+{
|
||||
+ /* do nothing */
|
||||
+}
|
||||
+
|
||||
+
|
||||
ngx_pid_t
|
||||
ngx_spawn_process(ngx_cycle_t *cycle, ngx_spawn_proc_pt proc, void *data,
|
||||
char *name, ngx_int_t respawn)
|
||||
@@ -557,6 +565,7 @@ ngx_process_get_status(void)
|
||||
}
|
||||
|
||||
ngx_unlock_mutexes(pid);
|
||||
+ ngx_proc_exit_top_handler(pid);
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/src/os/unix/ngx_process.h b/src/os/unix/ngx_process.h
|
||||
index 3986639b..c5972541 100644
|
||||
--- a/src/os/unix/ngx_process.h
|
||||
+++ b/src/os/unix/ngx_process.h
|
||||
@@ -18,6 +18,8 @@ typedef pid_t ngx_pid_t;
|
||||
#define NGX_INVALID_PID -1
|
||||
|
||||
typedef void (*ngx_spawn_proc_pt) (ngx_cycle_t *cycle, void *data);
|
||||
+#define NGX_HAVE_PROC_EXIT 1
|
||||
+typedef void (*ngx_proc_exit_pt)(ngx_pid_t pid);
|
||||
|
||||
typedef struct {
|
||||
ngx_pid_t pid;
|
||||
@@ -66,6 +67,7 @@ ngx_pid_t ngx_spawn_process(ngx_cycle_t *cycle,
|
||||
ngx_pid_t ngx_execute(ngx_cycle_t *cycle, ngx_exec_ctx_t *ctx);
|
||||
ngx_int_t ngx_init_signals(ngx_log_t *log);
|
||||
void ngx_debug_point(void);
|
||||
+void ngx_proc_exit_def_handler(ngx_pid_t pid);
|
||||
|
||||
|
||||
#if (NGX_HAVE_SCHED_YIELD)
|
||||
@@ -85,6 +87,7 @@ extern ngx_socket_t ngx_channel;
|
||||
extern ngx_int_t ngx_process_slot;
|
||||
extern ngx_int_t ngx_last_process;
|
||||
extern ngx_process_t ngx_processes[NGX_MAX_PROCESSES];
|
||||
+extern ngx_proc_exit_pt ngx_proc_exit_top_handler;
|
||||
|
||||
|
||||
#endif /* _NGX_PROCESS_H_INCLUDED_ */
|
||||
81
patches/nginx-1.27.0-proc_exit_handler.patch
Normal file
81
patches/nginx-1.27.0-proc_exit_handler.patch
Normal file
@@ -0,0 +1,81 @@
|
||||
commit 29cafd35fb2b7cff759fb4c9b84fa4600875321f
|
||||
Author: lijunlong <lijunlong@openresty.com>
|
||||
Date: Sun Apr 11 14:34:47 2021 +0800
|
||||
|
||||
feature: added a process exit callback point.
|
||||
|
||||
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
|
||||
index d7479fa4..c421e43c 100644
|
||||
--- a/src/core/ngx_cycle.c
|
||||
+++ b/src/core/ngx_cycle.c
|
||||
@@ -255,6 +255,7 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
|
||||
}
|
||||
|
||||
|
||||
+ ngx_proc_exit_top_handler = ngx_proc_exit_def_handler;
|
||||
conf.ctx = cycle->conf_ctx;
|
||||
conf.cycle = cycle;
|
||||
conf.pool = pool;
|
||||
diff --git a/src/os/unix/ngx_process.c b/src/os/unix/ngx_process.c
|
||||
index 15680237..9d2e81c5 100644
|
||||
--- a/src/os/unix/ngx_process.c
|
||||
+++ b/src/os/unix/ngx_process.c
|
||||
@@ -34,6 +34,7 @@ ngx_int_t ngx_process_slot;
|
||||
ngx_socket_t ngx_channel;
|
||||
ngx_int_t ngx_last_process;
|
||||
ngx_process_t ngx_processes[NGX_MAX_PROCESSES];
|
||||
+ngx_proc_exit_pt ngx_proc_exit_top_handler;
|
||||
|
||||
|
||||
ngx_signal_t signals[] = {
|
||||
@@ -83,6 +84,13 @@ ngx_signal_t signals[] = {
|
||||
};
|
||||
|
||||
|
||||
+void
|
||||
+ngx_proc_exit_def_handler(ngx_pid_t pid)
|
||||
+{
|
||||
+ /* do nothing */
|
||||
+}
|
||||
+
|
||||
+
|
||||
ngx_pid_t
|
||||
ngx_spawn_process(ngx_cycle_t *cycle, ngx_spawn_proc_pt proc, void *data,
|
||||
char *name, ngx_int_t respawn)
|
||||
@@ -557,6 +565,7 @@ ngx_process_get_status(void)
|
||||
}
|
||||
|
||||
ngx_unlock_mutexes(pid);
|
||||
+ ngx_proc_exit_top_handler(pid);
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/src/os/unix/ngx_process.h b/src/os/unix/ngx_process.h
|
||||
index 3986639b..c5972541 100644
|
||||
--- a/src/os/unix/ngx_process.h
|
||||
+++ b/src/os/unix/ngx_process.h
|
||||
@@ -18,6 +18,8 @@ typedef pid_t ngx_pid_t;
|
||||
#define NGX_INVALID_PID -1
|
||||
|
||||
typedef void (*ngx_spawn_proc_pt) (ngx_cycle_t *cycle, void *data);
|
||||
+#define NGX_HAVE_PROC_EXIT 1
|
||||
+typedef void (*ngx_proc_exit_pt)(ngx_pid_t pid);
|
||||
|
||||
typedef struct {
|
||||
ngx_pid_t pid;
|
||||
@@ -66,6 +67,7 @@ ngx_pid_t ngx_spawn_process(ngx_cycle_t *cycle,
|
||||
ngx_pid_t ngx_execute(ngx_cycle_t *cycle, ngx_exec_ctx_t *ctx);
|
||||
ngx_int_t ngx_init_signals(ngx_log_t *log);
|
||||
void ngx_debug_point(void);
|
||||
+void ngx_proc_exit_def_handler(ngx_pid_t pid);
|
||||
|
||||
|
||||
#if (NGX_HAVE_SCHED_YIELD)
|
||||
@@ -85,6 +87,7 @@ extern ngx_socket_t ngx_channel;
|
||||
extern ngx_int_t ngx_process_slot;
|
||||
extern ngx_int_t ngx_last_process;
|
||||
extern ngx_process_t ngx_processes[NGX_MAX_PROCESSES];
|
||||
+extern ngx_proc_exit_pt ngx_proc_exit_top_handler;
|
||||
|
||||
|
||||
#endif /* _NGX_PROCESS_H_INCLUDED_ */
|
||||
77
patches/nginx-1.27.1-proc_exit_handler.patch
Normal file
77
patches/nginx-1.27.1-proc_exit_handler.patch
Normal file
@@ -0,0 +1,77 @@
|
||||
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
|
||||
index c4e3c50..fa1408b 100644
|
||||
--- a/src/core/ngx_cycle.c
|
||||
+++ b/src/core/ngx_cycle.c
|
||||
@@ -264,6 +264,9 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
|
||||
}
|
||||
|
||||
|
||||
+#if !(NGX_WIN32)
|
||||
+ ngx_proc_exit_top_handler = ngx_proc_exit_def_handler;
|
||||
+#endif
|
||||
conf.ctx = cycle->conf_ctx;
|
||||
conf.cycle = cycle;
|
||||
conf.pool = pool;
|
||||
diff --git a/src/os/unix/ngx_process.c b/src/os/unix/ngx_process.c
|
||||
index 12a8c68..874c9bf 100644
|
||||
--- a/src/os/unix/ngx_process.c
|
||||
+++ b/src/os/unix/ngx_process.c
|
||||
@@ -34,6 +34,7 @@ ngx_int_t ngx_process_slot;
|
||||
ngx_socket_t ngx_channel;
|
||||
ngx_int_t ngx_last_process;
|
||||
ngx_process_t ngx_processes[NGX_MAX_PROCESSES];
|
||||
+ngx_proc_exit_pt ngx_proc_exit_top_handler;
|
||||
|
||||
|
||||
ngx_signal_t signals[] = {
|
||||
@@ -83,6 +84,13 @@ ngx_signal_t signals[] = {
|
||||
};
|
||||
|
||||
|
||||
+void
|
||||
+ngx_proc_exit_def_handler(ngx_pid_t pid)
|
||||
+{
|
||||
+ /* do nothing */
|
||||
+}
|
||||
+
|
||||
+
|
||||
ngx_pid_t
|
||||
ngx_spawn_process(ngx_cycle_t *cycle, ngx_spawn_proc_pt proc, void *data,
|
||||
char *name, ngx_int_t respawn)
|
||||
@@ -564,6 +572,7 @@ ngx_process_get_status(void)
|
||||
}
|
||||
|
||||
ngx_unlock_mutexes(pid);
|
||||
+ ngx_proc_exit_top_handler(pid);
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/src/os/unix/ngx_process.h b/src/os/unix/ngx_process.h
|
||||
index 3986639..0b55d98 100644
|
||||
--- a/src/os/unix/ngx_process.h
|
||||
+++ b/src/os/unix/ngx_process.h
|
||||
@@ -18,6 +18,8 @@ typedef pid_t ngx_pid_t;
|
||||
#define NGX_INVALID_PID -1
|
||||
|
||||
typedef void (*ngx_spawn_proc_pt) (ngx_cycle_t *cycle, void *data);
|
||||
+#define NGX_HAVE_PROC_EXIT 1
|
||||
+typedef void (*ngx_proc_exit_pt)(ngx_pid_t pid);
|
||||
|
||||
typedef struct {
|
||||
ngx_pid_t pid;
|
||||
@@ -66,6 +68,7 @@ ngx_pid_t ngx_spawn_process(ngx_cycle_t *cycle,
|
||||
ngx_pid_t ngx_execute(ngx_cycle_t *cycle, ngx_exec_ctx_t *ctx);
|
||||
ngx_int_t ngx_init_signals(ngx_log_t *log);
|
||||
void ngx_debug_point(void);
|
||||
+void ngx_proc_exit_def_handler(ngx_pid_t pid);
|
||||
|
||||
|
||||
#if (NGX_HAVE_SCHED_YIELD)
|
||||
@@ -85,6 +88,7 @@ extern ngx_socket_t ngx_channel;
|
||||
extern ngx_int_t ngx_process_slot;
|
||||
extern ngx_int_t ngx_last_process;
|
||||
extern ngx_process_t ngx_processes[NGX_MAX_PROCESSES];
|
||||
+extern ngx_proc_exit_pt ngx_proc_exit_top_handler;
|
||||
|
||||
|
||||
#endif /* _NGX_PROCESS_H_INCLUDED_ */
|
||||
208
patches/openssl-3.0.12-sess_set_get_cb_yield.patch
Normal file
208
patches/openssl-3.0.12-sess_set_get_cb_yield.patch
Normal file
@@ -0,0 +1,208 @@
|
||||
diff --git a/include/openssl/bio.h.in b/include/openssl/bio.h.in
|
||||
index c521e41e4a..7676e2f9ba 100644
|
||||
--- a/include/openssl/bio.h.in
|
||||
+++ b/include/openssl/bio.h.in
|
||||
@@ -256,6 +256,8 @@ void BIO_clear_flags(BIO *b, int flags);
|
||||
/* Returned from the accept BIO when an accept would have blocked */
|
||||
# define BIO_RR_ACCEPT 0x03
|
||||
|
||||
+# define BIO_RR_SSL_SESSION_LOOKUP 0x09
|
||||
+
|
||||
/* These are passed by the BIO callback */
|
||||
# define BIO_CB_FREE 0x01
|
||||
# define BIO_CB_READ 0x02
|
||||
diff --git a/include/openssl/ssl.h.in b/include/openssl/ssl.h.in
|
||||
index 105b4a4a3c..d961ae9f8f 100644
|
||||
--- a/include/openssl/ssl.h.in
|
||||
+++ b/include/openssl/ssl.h.in
|
||||
@@ -889,6 +889,7 @@ __owur int SSL_extension_supported(unsigned int ext_type);
|
||||
# define SSL_ASYNC_NO_JOBS 6
|
||||
# define SSL_CLIENT_HELLO_CB 7
|
||||
# define SSL_RETRY_VERIFY 8
|
||||
+# define SSL_SESS_LOOKUP 99
|
||||
|
||||
/* These will only be used when doing non-blocking IO */
|
||||
# define SSL_want_nothing(s) (SSL_want(s) == SSL_NOTHING)
|
||||
@@ -899,6 +900,7 @@ __owur int SSL_extension_supported(unsigned int ext_type);
|
||||
# define SSL_want_async(s) (SSL_want(s) == SSL_ASYNC_PAUSED)
|
||||
# define SSL_want_async_job(s) (SSL_want(s) == SSL_ASYNC_NO_JOBS)
|
||||
# define SSL_want_client_hello_cb(s) (SSL_want(s) == SSL_CLIENT_HELLO_CB)
|
||||
+# define SSL_want_sess_lookup(s) (SSL_want(s) == SSL_SESS_LOOKUP)
|
||||
|
||||
# define SSL_MAC_FLAG_READ_MAC_STREAM 1
|
||||
# define SSL_MAC_FLAG_WRITE_MAC_STREAM 2
|
||||
@@ -1191,6 +1193,8 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
|
||||
# define SSL_ERROR_WANT_ASYNC_JOB 10
|
||||
# define SSL_ERROR_WANT_CLIENT_HELLO_CB 11
|
||||
# define SSL_ERROR_WANT_RETRY_VERIFY 12
|
||||
+# define SSL_ERROR_WANT_SESSION_LOOKUP 99
|
||||
+# define SSL_ERROR_PENDING_SESSION 99 /* BoringSSL compatibility */
|
||||
|
||||
# ifndef OPENSSL_NO_DEPRECATED_3_0
|
||||
# define SSL_CTRL_SET_TMP_DH 3
|
||||
@@ -1700,6 +1704,7 @@ int SSL_SESSION_print(BIO *fp, const SSL_SESSION *ses);
|
||||
int SSL_SESSION_print_keylog(BIO *bp, const SSL_SESSION *x);
|
||||
int SSL_SESSION_up_ref(SSL_SESSION *ses);
|
||||
void SSL_SESSION_free(SSL_SESSION *ses);
|
||||
+SSL_SESSION *SSL_magic_pending_session_ptr(void);
|
||||
__owur int i2d_SSL_SESSION(const SSL_SESSION *in, unsigned char **pp);
|
||||
__owur int SSL_set_session(SSL *to, SSL_SESSION *session);
|
||||
int SSL_CTX_add_session(SSL_CTX *ctx, SSL_SESSION *session);
|
||||
diff --git a/ssl/bio_ssl.c b/ssl/bio_ssl.c
|
||||
index 401178f0c2..6b35549d22 100644
|
||||
--- a/ssl/bio_ssl.c
|
||||
+++ b/ssl/bio_ssl.c
|
||||
@@ -138,6 +138,10 @@ static int ssl_read(BIO *b, char *buf, size_t size, size_t *readbytes)
|
||||
BIO_set_retry_special(b);
|
||||
retry_reason = BIO_RR_SSL_X509_LOOKUP;
|
||||
break;
|
||||
+ case SSL_ERROR_WANT_SESSION_LOOKUP:
|
||||
+ BIO_set_retry_special(b);
|
||||
+ retry_reason = BIO_RR_SSL_SESSION_LOOKUP;
|
||||
+ break;
|
||||
case SSL_ERROR_WANT_ACCEPT:
|
||||
BIO_set_retry_special(b);
|
||||
retry_reason = BIO_RR_ACCEPT;
|
||||
@@ -206,6 +210,10 @@ static int ssl_write(BIO *b, const char *buf, size_t size, size_t *written)
|
||||
BIO_set_retry_special(b);
|
||||
retry_reason = BIO_RR_SSL_X509_LOOKUP;
|
||||
break;
|
||||
+ case SSL_ERROR_WANT_SESSION_LOOKUP:
|
||||
+ BIO_set_retry_special(b);
|
||||
+ retry_reason = BIO_RR_SSL_SESSION_LOOKUP;
|
||||
+ break;
|
||||
case SSL_ERROR_WANT_CONNECT:
|
||||
BIO_set_retry_special(b);
|
||||
retry_reason = BIO_RR_CONNECT;
|
||||
@@ -361,6 +369,10 @@ static long ssl_ctrl(BIO *b, int cmd, long num, void *ptr)
|
||||
BIO_set_retry_special(b);
|
||||
BIO_set_retry_reason(b, BIO_RR_SSL_X509_LOOKUP);
|
||||
break;
|
||||
+ case SSL_ERROR_WANT_SESSION_LOOKUP:
|
||||
+ BIO_set_retry_special(b);
|
||||
+ BIO_set_retry_reason(b, BIO_RR_SSL_SESSION_LOOKUP);
|
||||
+ break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
|
||||
index 81a9f0728d..19cb0297db 100644
|
||||
--- a/ssl/ssl_lib.c
|
||||
+++ b/ssl/ssl_lib.c
|
||||
@@ -3893,6 +3893,8 @@ int SSL_get_error(const SSL *s, int i)
|
||||
return SSL_ERROR_WANT_ASYNC_JOB;
|
||||
if (SSL_want_client_hello_cb(s))
|
||||
return SSL_ERROR_WANT_CLIENT_HELLO_CB;
|
||||
+ if (SSL_want_sess_lookup(s))
|
||||
+ return SSL_ERROR_WANT_SESSION_LOOKUP;
|
||||
|
||||
if ((s->shutdown & SSL_RECEIVED_SHUTDOWN) &&
|
||||
(s->s3.warn_alert == SSL_AD_CLOSE_NOTIFY))
|
||||
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
|
||||
index d836b33ed0..f02364cc9f 100644
|
||||
--- a/ssl/ssl_sess.c
|
||||
+++ b/ssl/ssl_sess.c
|
||||
@@ -20,6 +20,8 @@
|
||||
#include "ssl_local.h"
|
||||
#include "statem/statem_local.h"
|
||||
|
||||
+static const char g_pending_session_magic = 0;
|
||||
+
|
||||
static void SSL_SESSION_list_remove(SSL_CTX *ctx, SSL_SESSION *s);
|
||||
static void SSL_SESSION_list_add(SSL_CTX *ctx, SSL_SESSION *s);
|
||||
static int remove_session_lock(SSL_CTX *ctx, SSL_SESSION *c, int lck);
|
||||
@@ -514,6 +516,10 @@ SSL_SESSION *lookup_sess_in_cache(SSL *s, const unsigned char *sess_id,
|
||||
|
||||
ret = s->session_ctx->get_session_cb(s, sess_id, sess_id_len, ©);
|
||||
|
||||
+ if (ret == SSL_magic_pending_session_ptr()) {
|
||||
+ return ret; /* Retry later */
|
||||
+ }
|
||||
+
|
||||
if (ret != NULL) {
|
||||
ssl_tsan_counter(s->session_ctx,
|
||||
&s->session_ctx->stats.sess_cb_hit);
|
||||
@@ -602,6 +608,9 @@ int ssl_get_prev_session(SSL *s, CLIENTHELLO_MSG *hello)
|
||||
try_session_cache = 1;
|
||||
ret = lookup_sess_in_cache(s, hello->session_id,
|
||||
hello->session_id_len);
|
||||
+ if (ret == SSL_magic_pending_session_ptr()) {
|
||||
+ return -2; /* Retry later */
|
||||
+ }
|
||||
}
|
||||
break;
|
||||
case SSL_TICKET_NO_DECRYPT:
|
||||
@@ -1051,6 +1060,11 @@ X509 *SSL_SESSION_get0_peer(SSL_SESSION *s)
|
||||
return s->peer;
|
||||
}
|
||||
|
||||
+SSL_SESSION *SSL_magic_pending_session_ptr(void)
|
||||
+{
|
||||
+ return (SSL_SESSION *) &g_pending_session_magic;
|
||||
+}
|
||||
+
|
||||
int SSL_SESSION_set1_id_context(SSL_SESSION *s, const unsigned char *sid_ctx,
|
||||
unsigned int sid_ctx_len)
|
||||
{
|
||||
diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
|
||||
index a9e67f9d32..28c4698fda 100644
|
||||
--- a/ssl/statem/statem_srvr.c
|
||||
+++ b/ssl/statem/statem_srvr.c
|
||||
@@ -1599,6 +1599,7 @@ static int tls_early_post_process_client_hello(SSL *s)
|
||||
STACK_OF(SSL_CIPHER) *scsvs = NULL;
|
||||
CLIENTHELLO_MSG *clienthello = s->clienthello;
|
||||
DOWNGRADE dgrd = DOWNGRADE_NONE;
|
||||
+ PACKET saved_ciphers;
|
||||
|
||||
/* Finished parsing the ClientHello, now we can start processing it */
|
||||
/* Give the ClientHello callback a crack at things */
|
||||
@@ -1695,6 +1696,7 @@ static int tls_early_post_process_client_hello(SSL *s)
|
||||
}
|
||||
|
||||
s->hit = 0;
|
||||
+ saved_ciphers = clienthello->ciphersuites;
|
||||
|
||||
if (!ssl_cache_cipherlist(s, &clienthello->ciphersuites,
|
||||
clienthello->isv2) ||
|
||||
@@ -1794,6 +1796,10 @@ static int tls_early_post_process_client_hello(SSL *s)
|
||||
} else if (i == -1) {
|
||||
/* SSLfatal() already called */
|
||||
goto err;
|
||||
+ } else if (i == -2) {
|
||||
+ clienthello->ciphersuites = saved_ciphers;
|
||||
+ s->rwstate = SSL_SESS_LOOKUP;
|
||||
+ goto retry;
|
||||
} else {
|
||||
/* i == 0 */
|
||||
if (!ssl_get_new_session(s, 1)) {
|
||||
@@ -1801,6 +1807,7 @@ static int tls_early_post_process_client_hello(SSL *s)
|
||||
goto err;
|
||||
}
|
||||
}
|
||||
+ s->rwstate = SSL_NOTHING;
|
||||
}
|
||||
|
||||
if (SSL_IS_TLS13(s)) {
|
||||
@@ -2051,6 +2058,10 @@ static int tls_early_post_process_client_hello(SSL *s)
|
||||
s->clienthello = NULL;
|
||||
|
||||
return 0;
|
||||
+ retry:
|
||||
+ sk_SSL_CIPHER_free(ciphers);
|
||||
+ sk_SSL_CIPHER_free(scsvs);
|
||||
+ return -1;
|
||||
}
|
||||
|
||||
/*
|
||||
diff --git a/util/libssl.num b/util/libssl.num
|
||||
index f055c967bf..94e060e829 100644
|
||||
--- a/util/libssl.num
|
||||
+++ b/util/libssl.num
|
||||
@@ -7,6 +7,7 @@ SSL_copy_session_id 6 3_0_0 EXIST::FUNCTION:
|
||||
SSL_CTX_set_srp_password 7 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,SRP
|
||||
SSL_shutdown 8 3_0_0 EXIST::FUNCTION:
|
||||
SSL_CTX_set_msg_callback 9 3_0_0 EXIST::FUNCTION:
|
||||
+SSL_magic_pending_session_ptr 10 3_0_0 EXIST::FUNCTION:
|
||||
SSL_SESSION_get0_ticket 11 3_0_0 EXIST::FUNCTION:
|
||||
SSL_get1_supported_ciphers 12 3_0_0 EXIST::FUNCTION:
|
||||
SSL_state_string_long 13 3_0_0 EXIST::FUNCTION:
|
||||
208
patches/openssl-3.0.15-sess_set_get_cb_yield.patch
Normal file
208
patches/openssl-3.0.15-sess_set_get_cb_yield.patch
Normal file
@@ -0,0 +1,208 @@
|
||||
diff --git a/include/openssl/bio.h.in b/include/openssl/bio.h.in
|
||||
index cdc395b..9ed3d0e 100644
|
||||
--- a/include/openssl/bio.h.in
|
||||
+++ b/include/openssl/bio.h.in
|
||||
@@ -256,6 +256,8 @@ void BIO_clear_flags(BIO *b, int flags);
|
||||
/* Returned from the accept BIO when an accept would have blocked */
|
||||
# define BIO_RR_ACCEPT 0x03
|
||||
|
||||
+# define BIO_RR_SSL_SESSION_LOOKUP 0x09
|
||||
+
|
||||
/* These are passed by the BIO callback */
|
||||
# define BIO_CB_FREE 0x01
|
||||
# define BIO_CB_READ 0x02
|
||||
diff --git a/include/openssl/ssl.h.in b/include/openssl/ssl.h.in
|
||||
index 105b4a4..d961ae9 100644
|
||||
--- a/include/openssl/ssl.h.in
|
||||
+++ b/include/openssl/ssl.h.in
|
||||
@@ -889,6 +889,7 @@ __owur int SSL_extension_supported(unsigned int ext_type);
|
||||
# define SSL_ASYNC_NO_JOBS 6
|
||||
# define SSL_CLIENT_HELLO_CB 7
|
||||
# define SSL_RETRY_VERIFY 8
|
||||
+# define SSL_SESS_LOOKUP 99
|
||||
|
||||
/* These will only be used when doing non-blocking IO */
|
||||
# define SSL_want_nothing(s) (SSL_want(s) == SSL_NOTHING)
|
||||
@@ -899,6 +900,7 @@ __owur int SSL_extension_supported(unsigned int ext_type);
|
||||
# define SSL_want_async(s) (SSL_want(s) == SSL_ASYNC_PAUSED)
|
||||
# define SSL_want_async_job(s) (SSL_want(s) == SSL_ASYNC_NO_JOBS)
|
||||
# define SSL_want_client_hello_cb(s) (SSL_want(s) == SSL_CLIENT_HELLO_CB)
|
||||
+# define SSL_want_sess_lookup(s) (SSL_want(s) == SSL_SESS_LOOKUP)
|
||||
|
||||
# define SSL_MAC_FLAG_READ_MAC_STREAM 1
|
||||
# define SSL_MAC_FLAG_WRITE_MAC_STREAM 2
|
||||
@@ -1191,6 +1193,8 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
|
||||
# define SSL_ERROR_WANT_ASYNC_JOB 10
|
||||
# define SSL_ERROR_WANT_CLIENT_HELLO_CB 11
|
||||
# define SSL_ERROR_WANT_RETRY_VERIFY 12
|
||||
+# define SSL_ERROR_WANT_SESSION_LOOKUP 99
|
||||
+# define SSL_ERROR_PENDING_SESSION 99 /* BoringSSL compatibility */
|
||||
|
||||
# ifndef OPENSSL_NO_DEPRECATED_3_0
|
||||
# define SSL_CTRL_SET_TMP_DH 3
|
||||
@@ -1700,6 +1704,7 @@ int SSL_SESSION_print(BIO *fp, const SSL_SESSION *ses);
|
||||
int SSL_SESSION_print_keylog(BIO *bp, const SSL_SESSION *x);
|
||||
int SSL_SESSION_up_ref(SSL_SESSION *ses);
|
||||
void SSL_SESSION_free(SSL_SESSION *ses);
|
||||
+SSL_SESSION *SSL_magic_pending_session_ptr(void);
|
||||
__owur int i2d_SSL_SESSION(const SSL_SESSION *in, unsigned char **pp);
|
||||
__owur int SSL_set_session(SSL *to, SSL_SESSION *session);
|
||||
int SSL_CTX_add_session(SSL_CTX *ctx, SSL_SESSION *session);
|
||||
diff --git a/ssl/bio_ssl.c b/ssl/bio_ssl.c
|
||||
index be3159b..4cc5006 100644
|
||||
--- a/ssl/bio_ssl.c
|
||||
+++ b/ssl/bio_ssl.c
|
||||
@@ -138,6 +138,10 @@ static int ssl_read(BIO *b, char *buf, size_t size, size_t *readbytes)
|
||||
BIO_set_retry_special(b);
|
||||
retry_reason = BIO_RR_SSL_X509_LOOKUP;
|
||||
break;
|
||||
+ case SSL_ERROR_WANT_SESSION_LOOKUP:
|
||||
+ BIO_set_retry_special(b);
|
||||
+ retry_reason = BIO_RR_SSL_SESSION_LOOKUP;
|
||||
+ break;
|
||||
case SSL_ERROR_WANT_ACCEPT:
|
||||
BIO_set_retry_special(b);
|
||||
retry_reason = BIO_RR_ACCEPT;
|
||||
@@ -206,6 +210,10 @@ static int ssl_write(BIO *b, const char *buf, size_t size, size_t *written)
|
||||
BIO_set_retry_special(b);
|
||||
retry_reason = BIO_RR_SSL_X509_LOOKUP;
|
||||
break;
|
||||
+ case SSL_ERROR_WANT_SESSION_LOOKUP:
|
||||
+ BIO_set_retry_special(b);
|
||||
+ retry_reason = BIO_RR_SSL_SESSION_LOOKUP;
|
||||
+ break;
|
||||
case SSL_ERROR_WANT_CONNECT:
|
||||
BIO_set_retry_special(b);
|
||||
retry_reason = BIO_RR_CONNECT;
|
||||
@@ -361,6 +369,10 @@ static long ssl_ctrl(BIO *b, int cmd, long num, void *ptr)
|
||||
BIO_set_retry_special(b);
|
||||
BIO_set_retry_reason(b, BIO_RR_SSL_X509_LOOKUP);
|
||||
break;
|
||||
+ case SSL_ERROR_WANT_SESSION_LOOKUP:
|
||||
+ BIO_set_retry_special(b);
|
||||
+ BIO_set_retry_reason(b, BIO_RR_SSL_SESSION_LOOKUP);
|
||||
+ break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
|
||||
index e628140..d91a6b6 100644
|
||||
--- a/ssl/ssl_lib.c
|
||||
+++ b/ssl/ssl_lib.c
|
||||
@@ -3930,6 +3930,8 @@ int SSL_get_error(const SSL *s, int i)
|
||||
return SSL_ERROR_WANT_ASYNC_JOB;
|
||||
if (SSL_want_client_hello_cb(s))
|
||||
return SSL_ERROR_WANT_CLIENT_HELLO_CB;
|
||||
+ if (SSL_want_sess_lookup(s))
|
||||
+ return SSL_ERROR_WANT_SESSION_LOOKUP;
|
||||
|
||||
if ((s->shutdown & SSL_RECEIVED_SHUTDOWN) &&
|
||||
(s->s3.warn_alert == SSL_AD_CLOSE_NOTIFY))
|
||||
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
|
||||
index ec937a3..6846301 100644
|
||||
--- a/ssl/ssl_sess.c
|
||||
+++ b/ssl/ssl_sess.c
|
||||
@@ -20,6 +20,8 @@
|
||||
#include "ssl_local.h"
|
||||
#include "statem/statem_local.h"
|
||||
|
||||
+static const char g_pending_session_magic = 0;
|
||||
+
|
||||
static void SSL_SESSION_list_remove(SSL_CTX *ctx, SSL_SESSION *s);
|
||||
static void SSL_SESSION_list_add(SSL_CTX *ctx, SSL_SESSION *s);
|
||||
static int remove_session_lock(SSL_CTX *ctx, SSL_SESSION *c, int lck);
|
||||
@@ -546,6 +548,10 @@ SSL_SESSION *lookup_sess_in_cache(SSL *s, const unsigned char *sess_id,
|
||||
|
||||
ret = s->session_ctx->get_session_cb(s, sess_id, sess_id_len, ©);
|
||||
|
||||
+ if (ret == SSL_magic_pending_session_ptr()) {
|
||||
+ return ret; /* Retry later */
|
||||
+ }
|
||||
+
|
||||
if (ret != NULL) {
|
||||
if (ret->not_resumable) {
|
||||
/* If its not resumable then ignore this session */
|
||||
@@ -640,6 +646,9 @@ int ssl_get_prev_session(SSL *s, CLIENTHELLO_MSG *hello)
|
||||
try_session_cache = 1;
|
||||
ret = lookup_sess_in_cache(s, hello->session_id,
|
||||
hello->session_id_len);
|
||||
+ if (ret == SSL_magic_pending_session_ptr()) {
|
||||
+ return -2; /* Retry later */
|
||||
+ }
|
||||
}
|
||||
break;
|
||||
case SSL_TICKET_NO_DECRYPT:
|
||||
@@ -1089,6 +1098,11 @@ X509 *SSL_SESSION_get0_peer(SSL_SESSION *s)
|
||||
return s->peer;
|
||||
}
|
||||
|
||||
+SSL_SESSION *SSL_magic_pending_session_ptr(void)
|
||||
+{
|
||||
+ return (SSL_SESSION *) &g_pending_session_magic;
|
||||
+}
|
||||
+
|
||||
int SSL_SESSION_set1_id_context(SSL_SESSION *s, const unsigned char *sid_ctx,
|
||||
unsigned int sid_ctx_len)
|
||||
{
|
||||
diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
|
||||
index df7c868..b22adec 100644
|
||||
--- a/ssl/statem/statem_srvr.c
|
||||
+++ b/ssl/statem/statem_srvr.c
|
||||
@@ -1599,6 +1599,7 @@ static int tls_early_post_process_client_hello(SSL *s)
|
||||
STACK_OF(SSL_CIPHER) *scsvs = NULL;
|
||||
CLIENTHELLO_MSG *clienthello = s->clienthello;
|
||||
DOWNGRADE dgrd = DOWNGRADE_NONE;
|
||||
+ PACKET saved_ciphers;
|
||||
|
||||
/* Finished parsing the ClientHello, now we can start processing it */
|
||||
/* Give the ClientHello callback a crack at things */
|
||||
@@ -1695,6 +1696,7 @@ static int tls_early_post_process_client_hello(SSL *s)
|
||||
}
|
||||
|
||||
s->hit = 0;
|
||||
+ saved_ciphers = clienthello->ciphersuites;
|
||||
|
||||
if (!ssl_cache_cipherlist(s, &clienthello->ciphersuites,
|
||||
clienthello->isv2) ||
|
||||
@@ -1794,6 +1796,10 @@ static int tls_early_post_process_client_hello(SSL *s)
|
||||
} else if (i == -1) {
|
||||
/* SSLfatal() already called */
|
||||
goto err;
|
||||
+ } else if (i == -2) {
|
||||
+ clienthello->ciphersuites = saved_ciphers;
|
||||
+ s->rwstate = SSL_SESS_LOOKUP;
|
||||
+ goto retry;
|
||||
} else {
|
||||
/* i == 0 */
|
||||
if (!ssl_get_new_session(s, 1)) {
|
||||
@@ -1801,6 +1807,7 @@ static int tls_early_post_process_client_hello(SSL *s)
|
||||
goto err;
|
||||
}
|
||||
}
|
||||
+ s->rwstate = SSL_NOTHING;
|
||||
}
|
||||
|
||||
if (SSL_IS_TLS13(s)) {
|
||||
@@ -2051,6 +2058,10 @@ static int tls_early_post_process_client_hello(SSL *s)
|
||||
s->clienthello = NULL;
|
||||
|
||||
return 0;
|
||||
+ retry:
|
||||
+ sk_SSL_CIPHER_free(ciphers);
|
||||
+ sk_SSL_CIPHER_free(scsvs);
|
||||
+ return -1;
|
||||
}
|
||||
|
||||
/*
|
||||
diff --git a/util/libssl.num b/util/libssl.num
|
||||
index f055c96..94e060e 100644
|
||||
--- a/util/libssl.num
|
||||
+++ b/util/libssl.num
|
||||
@@ -7,6 +7,7 @@ SSL_copy_session_id 6 3_0_0 EXIST::FUNCTION:
|
||||
SSL_CTX_set_srp_password 7 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,SRP
|
||||
SSL_shutdown 8 3_0_0 EXIST::FUNCTION:
|
||||
SSL_CTX_set_msg_callback 9 3_0_0 EXIST::FUNCTION:
|
||||
+SSL_magic_pending_session_ptr 10 3_0_0 EXIST::FUNCTION:
|
||||
SSL_SESSION_get0_ticket 11 3_0_0 EXIST::FUNCTION:
|
||||
SSL_get1_supported_ciphers 12 3_0_0 EXIST::FUNCTION:
|
||||
SSL_state_string_long 13 3_0_0 EXIST::FUNCTION:
|
||||
118
t/000-sanity.t
118
t/000-sanity.t
@@ -348,7 +348,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -438,7 +438,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -528,7 +528,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -618,7 +618,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -707,7 +707,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -796,7 +796,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -1138,7 +1138,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -1229,7 +1229,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -1333,7 +1333,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -1423,7 +1423,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -1516,7 +1516,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -1607,7 +1607,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -1713,7 +1713,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -1804,7 +1804,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -1925,7 +1925,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -2015,7 +2015,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -2105,7 +2105,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -2195,7 +2195,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -2285,7 +2285,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -2375,7 +2375,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -2468,7 +2468,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -2562,7 +2562,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -2650,7 +2650,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -2738,7 +2738,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-core-0.1.29 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-upstream-healthcheck-0.08 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -2827,7 +2827,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-upstream-healthcheck-0.08 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -2914,7 +2914,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-upstream-healthcheck-0.08 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -3000,7 +3000,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -3088,7 +3088,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -3172,7 +3172,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -3262,7 +3262,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -3352,7 +3352,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -3442,7 +3442,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -3532,7 +3532,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -3621,7 +3621,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -3710,7 +3710,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -3800,7 +3800,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -3891,7 +3891,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -3981,7 +3981,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -4071,7 +4071,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -4161,7 +4161,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -4251,7 +4251,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -4341,7 +4341,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -4430,7 +4430,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -4522,7 +4522,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=./lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=./lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=./lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)./bin/'
|
||||
mkdir -p '$(DESTDIR)./bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)./bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)./bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)./
|
||||
@@ -4614,7 +4614,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=./lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=./lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=./lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)./bin/'
|
||||
mkdir -p '$(DESTDIR)./bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)./bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)./bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)./
|
||||
@@ -4706,7 +4706,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=./lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=./lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=./lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)./bin/'
|
||||
mkdir -p '$(DESTDIR)./bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)./bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)./bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)./
|
||||
@@ -4797,7 +4797,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-upstream-healthcheck-0.08 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=./lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=./lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=./lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)./'
|
||||
mkdir -p '$(DESTDIR)./'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)./'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)./
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)./
|
||||
@@ -4886,7 +4886,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -4976,7 +4976,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -5066,7 +5066,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -5156,7 +5156,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -5246,7 +5246,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -5336,7 +5336,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -5426,7 +5426,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -5516,7 +5516,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -5605,7 +5605,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -5662,7 +5662,7 @@ all:
|
||||
install: all
|
||||
mkdir -p $(DESTDIR)/usr/local/openresty/
|
||||
-cp $OPENRESTY_DIR/COPYRIGHT $(DESTDIR)/usr/local/openresty/
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -5752,7 +5752,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
@@ -5895,7 +5895,7 @@ install: all
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-limit-traffic-0.09 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-resty-shell-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
cd $OPENRESTY_BUILD_DIR/lua-tablepool-0.03 && $(MAKE) install DESTDIR=$(DESTDIR) LUA_LIB_DIR=/usr/local/openresty/lualib INSTALL='$(INSTALL)'
|
||||
mkdir '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
mkdir -p '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/opm-0.0.8 && $(INSTALL) bin/* '$(DESTDIR)/usr/local/openresty/bin/'
|
||||
cd $OPENRESTY_BUILD_DIR/resty-cli-0.30 && $(INSTALL) bin/* $(DESTDIR)/usr/local/openresty/bin/
|
||||
cp $OPENRESTY_BUILD_DIR/resty.index $(DESTDIR)/usr/local/openresty/
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
|
||||
PCRE=pcre-8.45
|
||||
PCRE=pcre2-10.44
|
||||
ZLIB=zlib-1.3.1
|
||||
OPENSSL=openssl-1.1.1w
|
||||
JOBS=12
|
||||
|
||||
2
util/configure
vendored
2
util/configure
vendored
@@ -1147,7 +1147,7 @@ _EOC_
|
||||
$target_dir = "\$(DESTDIR)$prefix/bin/";
|
||||
}
|
||||
push @make_install_cmds,
|
||||
"mkdir '$target_dir'",
|
||||
"mkdir -p '$target_dir'",
|
||||
"cd $root_dir/build/$opm_dir && "
|
||||
. "\$(INSTALL) bin/* '$target_dir'";
|
||||
}
|
||||
|
||||
@@ -541,6 +541,13 @@ echo "$info_txt applying the reuseport_close_unused_fds patch for nginx"
|
||||
patch -p1 < $root/patches/nginx-$main_ver-reuseport_close_unused_fds.patch || exit 1
|
||||
echo
|
||||
|
||||
|
||||
answer=`$root/util/ver-ge "$main_ver" 1.19.9`
|
||||
if [ "$answer" = "Y" ]; then
|
||||
echo "$info_txt applying nginx-$main_ver-proc_exit_handler patch for nginx"
|
||||
patch -p1 < $root/patches/nginx-$main_ver-proc_exit_handler.patch || exit 1
|
||||
fi
|
||||
|
||||
cp $root/html/index.html docs/html/ || exit 1
|
||||
cp $root/html/50x.html docs/html/ || exit 1
|
||||
|
||||
@@ -875,7 +882,7 @@ cd ..
|
||||
|
||||
#################################
|
||||
|
||||
ver=0.14
|
||||
ver=0.15
|
||||
$root/util/get-tarball "https://github.com/openresty/lua-resty-lrucache/tarball/v$ver" -O "lua-resty-lrucache-$ver.tar.gz" || exit 1
|
||||
tar -xzf lua-resty-lrucache-$ver.tar.gz || exit 1
|
||||
mv openresty-lua-resty-lrucache-* lua-resty-lrucache-$ver || exit 1
|
||||
@@ -886,7 +893,7 @@ cd ..
|
||||
|
||||
#################################
|
||||
|
||||
ver=0.1.29
|
||||
ver=0.1.30
|
||||
$root/util/get-tarball "https://github.com/openresty/lua-resty-core/tarball/v$ver" -O "lua-resty-core-$ver.tar.gz" || exit 1
|
||||
tar -xzf lua-resty-core-$ver.tar.gz || exit 1
|
||||
mv openresty-lua-resty-core-* lua-resty-core-$ver || exit 1
|
||||
|
||||
Reference in New Issue
Block a user