cvs: php4 /ext/ircg ircg_common.c
| From: | Sascha Schumann | Date: | Mon, 28 Apr 2003 16:51:24 +0000 |
| Subject: | cvs: php4 /ext/ircg ircg_common.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-20543@lists.php.net to get a copy of this message | ||
sas Mon Apr 28 12:51:24 2003 EDT
Modified files:
/php4/ext/ircg ircg_common.c
Log:
add experimental support for ibm http server
Index: php4/ext/ircg/ircg_common.c
diff -u php4/ext/ircg/ircg_common.c:1.4 php4/ext/ircg/ircg_common.c:1.5
--- php4/ext/ircg/ircg_common.c:1.4 Tue Apr 22 02:13:28 2003
+++ php4/ext/ircg/ircg_common.c Mon Apr 28 12:51:24 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ircg_common.c,v 1.4 2003/04/22 06:13:28 sas Exp $ */
+/* $Id: ircg_common.c,v 1.5 2003/04/28 16:51:24 sas Exp $ */
#include "php.h"
@@ -42,6 +42,11 @@
static gid_t *php_ircg_ap_group_id;
typedef struct {
+ unsigned long a;
+ int fd;
+} ircg_APFD;
+
+typedef struct {
int a;
unsigned char *b;
int c[3];
@@ -52,7 +57,11 @@
long int h;
void *i;
- int fd;
+ union {
+ int fd;
+ /* IBM HTTP Server adds another abstraction layer */
+ ircg_APFD *apfd;
+ } x;
} ircg_BUFF;
typedef struct {
@@ -98,7 +107,11 @@
ircg_request_rec *r = SG(server_context);
int fd;
- fd = r->connection->client->fd;
+ fd = r->connection->client->x.fd;
+
+ if (fd < -1 && fd > 130000) {
+ fd = r->connection->client->x.apfd->fd;
+ }
if (fd >= 0 && fd < 130000) {
*nfd = fd;