# HG changeset patch
# User Sergey Kandaurov <pluknet@nginx.com>
# Date 1477057043 -10800
# Node ID 1b11a12be17913a75e81d318dcb6b912eac5f29e
# Parent  d0ec761774a5220083fa8044cea179b7d5e03982
Tests: pass both issuer/subject variable formats where appropriate.

diff --git a/mail_imap_ssl.t b/mail_imap_ssl.t
--- a/mail_imap_ssl.t
+++ b/mail_imap_ssl.t
@@ -216,11 +216,11 @@ my $f = $t->read_file('auth.log');
 
 like($f, qr/^-:-:-:-:-:-:-\x0d?\x0a?:s1$/m, 'log - plain connection');
 like($f, qr/^on:NONE:-:-:-:-:-\x0d?\x0a?:s2$/m, 'log - no cert');
-like($f, qr!^on:FAILED:/CN=1.example.com:/CN=1.example.com:\w+:\w+:[^:]+:s3$!m,
+like($f, qr!^on:FAILED:(/?CN=1.example.com):\1:\w+:\w+:[^:]+:s3$!m,
 	'log - bad cert');
-like($f, qr!^on:SUCCESS:/CN=2.example.com:/CN=2.example.com:\w+:\w+:[^:]+:s4$!m,
+like($f, qr!^on:SUCCESS:(/?CN=2.example.com):\1:\w+:\w+:[^:]+:s4$!m,
 	'log - good cert');
-like($f, qr!^on:SUCCESS:/CN=3.example.com:/CN=3.example.com:\w+:\w+:[^:]+:s5$!m,
+like($f, qr!^on:SUCCESS:(/?CN=3.example.com):\1:\w+:\w+:[^:]+:s5$!m,
 	'log - trusted cert');
 
 ###############################################################################
diff --git a/proxy_ssl_certificate.t b/proxy_ssl_certificate.t
--- a/proxy_ssl_certificate.t
+++ b/proxy_ssl_certificate.t
@@ -139,7 +139,7 @@ like(http_get('/verify'), qr/X-Verify: S
 like(http_get('/fail'), qr/X-Verify: FAILED/ms, 'fail certificate');
 like(http_get('/encrypted'), qr/X-Verify: SUCCESS/ms, 'with encrypted key');
 
-like(http_get('/verify'), qr!X-Name: /CN=1.example!, 'valid certificate');
-unlike(http_get('/fail'), qr!X-Name: /CN=1.example!, 'invalid certificate');
+like(http_get('/verify'), qr!X-Name: /?CN=1.example!, 'valid certificate');
+unlike(http_get('/fail'), qr!X-Name: /?CN=1.example!, 'invalid certificate');
 
 ###############################################################################
diff --git a/stream_proxy_ssl_certificate.t b/stream_proxy_ssl_certificate.t
--- a/stream_proxy_ssl_certificate.t
+++ b/stream_proxy_ssl_certificate.t
@@ -147,9 +147,9 @@ like(http_get('/', socket => getconn('12
 	qr/X-Verify: SUCCESS/ms, 'with encrypted key');
 
 like(http_get('/', socket => getconn('127.0.0.1:' . port(8082))),
-	qr!X-Name: /CN=1.example!, 'valid certificate');
+	qr!X-Name: /?CN=1.example!, 'valid certificate');
 unlike(http_get('/', socket => getconn('127.0.0.1:' . port(8083))),
-	qr!X-Name: /CN=1.example!, 'invalid certificate');
+	qr!X-Name: /?CN=1.example!, 'invalid certificate');
 
 ###############################################################################