svn commit: r787722 - /httpd/httpd/trunk/modules/ssl/ssl_engine_io.c

[jo...@apache.org]

Author: jorton
Date: Tue Jun 23 15:42:02 2009
New Revision: 787722

URL: http://svn.apache.org/viewvc?rev=787722&view=rev
Log:
* modules/ssl/ssl_engine_io.c (bio_filter_out_ctrl): Switch
  implementation of BIO_CTRL_PENDING and BIO_CTRL_WPENDING, to return
  zero and pending-bytes-to-write respectively.

PR: 46952
Submitted by: David Smith <David.Smith cern.ch>

Modified:
    httpd/httpd/trunk/modules/ssl/ssl_engine_io.c

Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_io.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_io.c?rev=787722&r1=787721&r2=787722&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_io.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_io.c Tue Jun 23 15:42:02 2009
@@ -261,10 +261,14 @@
       case BIO_CTRL_SET_CLOSE:
         bio->shutdown = (int)num;
         break;
-      case BIO_CTRL_WPENDING:
+      case BIO_CTRL_PENDING:
+        /* _PENDING is interpreted as "pending to read" - since this
+         * is a *write* buffer, return zero. */
         ret = 0L;
         break;
-      case BIO_CTRL_PENDING:
+      case BIO_CTRL_WPENDING:
+        /* _WPENDING is interpreted as "pending to write" - return the
+         * number of bytes in ->bb plus buffer. */
         ret = (long)(outctx->blen + outctx->length);
         break;
       case BIO_CTRL_FLUSH: