mirrors
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix merge conflict misses on alpn example letter change

This commit is contained in:
toddouska 2015-10-15 09:48:07 -07:00
parent 32171997e7
commit 74e981093d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/client/client.c
View File

@ -461,7 +461,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
StackTrap(); StackTrap();
while ((ch = mygetopt(argc, argv, while ((ch = mygetopt(argc, argv,
"?gdeDusmNrwRitfxXUPCh:p:v:l:A:c:k:Z:b:zS:L:ToO:an:B:")) "?gdeDusmNrwRitfxXUPCh:p:v:l:A:c:k:Z:b:zS:L:ToO:aB:"))
!= -1) { != -1) {
switch (ch) { switch (ch) {
case '?' : case '?' :
@ -668,7 +668,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
#endif #endif
break; break;
case 'n' : case 'L' :
#ifdef HAVE_ALPN #ifdef HAVE_ALPN
alpnList = myoptarg; alpnList = myoptarg;