cvs: php-src /ext/openssl xp_ssl.c
| From: | Wez Furlong | Date: | Sun, 21 Sep 2003 18:02:07 +0000 |
| Subject: | cvs: php-src /ext/openssl xp_ssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-23831@lists.php.net to get a copy of this message | ||
wez Sun Sep 21 14:02:07 2003 EDT
Modified files:
/php-src/ext/openssl xp_ssl.c
Log:
Merge remaining code from 4.3 to fix #22238 in HEAD.
Index: php-src/ext/openssl/xp_ssl.c
diff -u php-src/ext/openssl/xp_ssl.c:1.8 php-src/ext/openssl/xp_ssl.c:1.9
--- php-src/ext/openssl/xp_ssl.c:1.8 Sun Jun 15 19:34:46 2003
+++ php-src/ext/openssl/xp_ssl.c Sun Sep 21 14:02:07 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xp_ssl.c,v 1.8 2003/06/15 23:34:46 edink Exp $ */
+/* $Id: xp_ssl.c,v 1.9 2003/09/21 18:02:07 wez Exp $ */
#include "php.h"
#include "ext/standard/file.h"
@@ -482,6 +482,7 @@
return FAILURE;
}
return SUCCESS;
+ case PHP_STREAM_AS_FD_FOR_SELECT:
case PHP_STREAM_AS_FD:
case PHP_STREAM_AS_SOCKETD:
if (sslsock->ssl_active) {