projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix comments, add new test.
[openssl.git]
/
apps
/
s_server.c
diff --git
a/apps/s_server.c
b/apps/s_server.c
index 9d1a1fa87ce508d1dd5d9af5b03a662cdffa40fa..1e15281c213afafbb726e71eb0d42d94862dd102 100644
(file)
--- a/
apps/s_server.c
+++ b/
apps/s_server.c
@@
-1532,6
+1532,14
@@
bad:
sv_usage();
goto end;
}
sv_usage();
goto end;
}
+#ifndef OPENSSL_NO_DTLS1
+ if (www && socket_type == SOCK_DGRAM)
+ {
+ BIO_printf(bio_err,
+ "Can't use -HTTP, -www or -WWW with DTLS\n");
+ goto end;
+ }
+#endif
if (unix_path && (socket_type != SOCK_STREAM))
{
if (unix_path && (socket_type != SOCK_STREAM))
{
@@
-2963,7
+2971,7
@@
static int www_body(char *hostname, int s, int stype, unsigned char *context)
BIO_printf(bio_s_out,"read R BLOCK\n");
#if defined(OPENSSL_SYS_NETWARE)
delay(1000);
BIO_printf(bio_s_out,"read R BLOCK\n");
#if defined(OPENSSL_SYS_NETWARE)
delay(1000);
-#elif !defined(OPENSSL_SYS_MSDOS)
&& !defined(__DJGPP__)
+#elif !defined(OPENSSL_SYS_MSDOS)
sleep(1);
#endif
continue;
sleep(1);
#endif
continue;
@@
-3358,7
+3366,7
@@
static int rev_body(char *hostname, int s, int stype, unsigned char *context)
BIO_printf(bio_s_out,"read R BLOCK\n");
#if defined(OPENSSL_SYS_NETWARE)
delay(1000);
BIO_printf(bio_s_out,"read R BLOCK\n");
#if defined(OPENSSL_SYS_NETWARE)
delay(1000);
-#elif !defined(OPENSSL_SYS_MSDOS)
&& !defined(__DJGPP__)
+#elif !defined(OPENSSL_SYS_MSDOS)
sleep(1);
#endif
continue;
sleep(1);
#endif
continue;