summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--docs/changes.xml7
-rw-r--r--src/nxt_cert.c10
2 files changed, 13 insertions, 4 deletions
diff --git a/docs/changes.xml b/docs/changes.xml
index d9d25e5c..07decb2a 100644
--- a/docs/changes.xml
+++ b/docs/changes.xml
@@ -30,6 +30,13 @@ reconfiguring an application; the bug had appeared in 1.19.0.
</para>
</change>
+<change type="bugfix">
+<para>
+persistent storage of certificates might've not worked with some filesystems in
+Linux, and all uploaded certificate bundles were forgotten after restart.
+</para>
+</change>
+
</changes>
diff --git a/src/nxt_cert.c b/src/nxt_cert.c
index 9e825d80..357a9211 100644
--- a/src/nxt_cert.c
+++ b/src/nxt_cert.c
@@ -838,7 +838,12 @@ nxt_cert_store_load(nxt_task_t *task, nxt_mp_t *mp)
break;
}
- if (de->d_type != DT_REG) {
+ nxt_debug(task, "readdir(\"%s\"): \"%s\"", rt->certs.start, de->d_name);
+
+ name.length = nxt_strlen(de->d_name);
+ name.start = (u_char *) de->d_name;
+
+ if (nxt_str_eq(&name, ".", 1) || nxt_str_eq(&name, "..", 2)) {
continue;
}
@@ -849,9 +854,6 @@ nxt_cert_store_load(nxt_task_t *task, nxt_mp_t *mp)
item->fd = -1;
- name.length = nxt_strlen(de->d_name);
- name.start = (u_char *) de->d_name;
-
size = rt->certs.length + name.length + 1;
if (size > alloc) {