Index: apps/s_server.c
===================================================================
RCS file: /v/openssl/cvs/openssl/apps/s_server.c,v
retrieving revision 1.193
diff -u -p -r1.193 s_server.c
--- apps/s_server.c	29 Aug 2012 13:18:33 -0000	1.193
+++ apps/s_server.c	29 Aug 2012 20:12:31 -0000
@@ -580,6 +580,7 @@ static void sv_usage(void)
 #endif
 	BIO_printf(bio_err," -keymatexport label   - Export keying material using label\n");
 	BIO_printf(bio_err," -keymatexportlen len  - Export len bytes of keying material (default 20)\n");
+	BIO_printf(bio_err," -no_comp      - Disable compression\n");
 	}
 
 static int local_argc=0;
Index: doc/apps/s_server.pod
===================================================================
RCS file: /v/openssl/cvs/openssl/doc/apps/s_server.pod,v
retrieving revision 1.18
diff -u -p -r1.18 s_server.pod
--- doc/apps/s_server.pod	15 Apr 2009 15:26:56 -0000	1.18
+++ doc/apps/s_server.pod	29 Aug 2012 20:12:31 -0000
@@ -54,6 +54,7 @@ B<openssl> B<s_server>
 [B<-no_ticket>]
 [B<-id_prefix arg>]
 [B<-rand file(s)>]
+[B<-no_comp>]
 
 =head1 DESCRIPTION
 
@@ -276,6 +277,10 @@ Multiple files can be specified separate
 The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
 all others.
 
+=item B<-no_comp>
+
+disables compression.
+
 =back
 
 =head1 CONNECTED COMMANDS