1 files changed, 8 insertions, 2 deletions

diff --git a/src/gmrequest.c b/src/gmrequest.c
index 9b640cee..44ef063f 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -290,8 +290,14 @@ static void requestFinished_GmRequest_(iGmRequest *d, iTlsRequest *req) {
                                                                  : finished_GmRequestState);
     if (d->state == failure_GmRequestState) {
         if (!isVerified_TlsRequest(req)) {
-            d->resp->statusCode = tlsServerCertificateNotVerified_GmStatusCode;
-            setCStr_String(&d->resp->meta, "Server certificate could not be verified");
+            if (isExpired_TlsCertificate(serverCertificate_TlsRequest(req))) {
+                d->resp->statusCode = tlsServerCertificateExpired_GmStatusCode;
+                setCStr_String(&d->resp->meta, "Server certificate has expired");
+            }
+            else {
+                d->resp->statusCode = tlsServerCertificateNotVerified_GmStatusCode;
+                setCStr_String(&d->resp->meta, "Server certificate could not be verified");
+            }
         }
         else {
             d->resp->statusCode = tlsFailure_GmStatusCode;