Re: svn commit: r416265 - in /httpd/httpd/trunk/modules/ssl: mod_ssl.c ssl_engine_config.c ssl_engine_io.c ssl_private.h

[Joe Orton <jo...@redhat.com>]

On Thu, Jun 22, 2006 at 06:13:08AM -0000, William Rowe wrote:
> Author: wrowe
> Date: Wed Jun 21 23:13:07 2006
> New Revision: 416265
> 
> URL: http://svn.apache.org/viewvc?rev=416265&view=rev
> Log:
> 
>   New SSLLogLevelDebugDump [ None (default) | IO (not bytes) | Bytes ]
>   configures the I/O Dump of SSL traffic, when LogLevel is set to Debug.
>   The default is none as this is far greater debugging resolution than 
>   the typical administrator is prepared to untangle.
...
> ==============================================================================
> --- httpd/httpd/trunk/modules/ssl/ssl_engine_io.c (original)
> +++ httpd/httpd/trunk/modules/ssl/ssl_engine_io.c Wed Jun 21 23:13:07 2006
...
> @@ -1793,7 +1798,7 @@
>                      rc, argi, (cmd == (BIO_CB_WRITE|BIO_CB_RETURN) ? "to" : "from"),
>                      bio, argp,
>                      (argp != NULL ? "(BIO dump follows)" : "(Oops, no memory buffer?)"));
> -            if (argp != NULL)
> +            if ((argp != NULL) && (sc->ssl_log_level >= SSL_LOG_BYTES))
>                  ssl_io_data_dump(s, argp, rc);

Looks like the debug message above needs to be adjusted for this, it's 
going to say "BIO dump follows" when no BIO dump will follow (in the 
default config)?

joe

Re: svn commit: r416265 - in /httpd/httpd/trunk/modules/ssl: mod_ssl.c ssl_engine_config.c ssl_engine_io.c ssl_private.h

["William A. Rowe, Jr." <wr...@rowe-clan.net>]

Joe Orton wrote:
>> @@ -1793,7 +1798,7 @@
>>                      rc, argi, (cmd == (BIO_CB_WRITE|BIO_CB_RETURN) ? "to" : "from"),
>>                      bio, argp,
>>                      (argp != NULL ? "(BIO dump follows)" : "(Oops, no memory buffer?)"));
>> -            if (argp != NULL)
>> +            if ((argp != NULL) && (sc->ssl_log_level >= SSL_LOG_BYTES))
>>                  ssl_io_data_dump(s, argp, rc);
> 
> Looks like the debug message above needs to be adjusted for this, it's 
> going to say "BIO dump follows" when no BIO dump will follow (in the 
> default config)?

Yup, note that argp != null was the old condition to both.  (Well, the exception
case text doesn't apply to us ;-)   But you are right, this would be more sane,
additional commits and feedback are welcome, I'm really counting minutes now
trying to get ready to ship off to IE.

Bill