sas Mon Feb 10 21:23:29 2003 EDT
Modified files:
/php4/sapi/apache config.m4 mod_php4.c
Log:
Detect whether BUFFs contain a fd element. IBM is hiding the actual
descriptor behind a void *, so we just disable this for IBM servers
Index: php4/sapi/apache/config.m4
diff -u php4/sapi/apache/config.m4:1.62 php4/sapi/apache/config.m4:1.63
--- php4/sapi/apache/config.m4:1.62 Thu Jul 25 14:37:16 2002
+++ php4/sapi/apache/config.m4 Mon Feb 10 21:23:29 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.62 2002/07/25 18:37:16 sniper Exp $
+dnl $Id: config.m4,v 1.63 2003/02/11 02:23:29 sas Exp $
dnl
AC_MSG_CHECKING(for Apache 1.x module support via DSO through APXS)
@@ -212,6 +212,19 @@
PHP_SUBST(APACHE_INSTALL)
PHP_SUBST(STRONGHOLD)
+AC_CACHE_CHECK([for member fd in BUFF *],ac_cv_php_fd_in_buff,[
+ save=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $APACHE_INCLUDE"
+ AC_TRY_COMPILE([#include <httpd.h>],[conn_rec *c; int fd = c->client->fd;],[
+ ac_cv_php_fd_in_buff=yes],[ac_cv_php_fd_in_buff=no],[ac_cv_php_fd_in_buff=no])
+ CPPFLAGS=$save
+],[
+ if test "$ac_cv_php_fd_in_buff" = "yes"; then
+ AC_DEFINE(PHP_APACHE_HAVE_CLIENT_FD, 1, [ ])
+ fi
+])
+
+
AC_MSG_CHECKING(for mod_charset compatibility option)
AC_ARG_WITH(mod_charset,
[ --with-mod_charset Enable transfer tables for mod_charset (Rus Apache).],
Index: php4/sapi/apache/mod_php4.c
diff -u php4/sapi/apache/mod_php4.c:1.155 php4/sapi/apache/mod_php4.c:1.156
--- php4/sapi/apache/mod_php4.c:1.155 Sun Feb 9 16:15:54 2003
+++ php4/sapi/apache/mod_php4.c Mon Feb 10 21:23:29 2003
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php4.c,v 1.155 2003/02/09 21:15:54 sas Exp $ */
+/* $Id: mod_php4.c,v 1.156 2003/02/11 02:23:29 sas Exp $ */
#include "php_apache_http.h"
#include "http_conf_globals.h"
@@ -348,6 +348,7 @@
*/
static int sapi_apache_get_fd(int *nfd TSRMLS_DC)
{
+#if PHP_APACHE_HAVE_CLIENT_FD
request_rec *r = SG(server_context);
int fd;
@@ -357,6 +358,7 @@
if (nfd) *nfd = fd;
return SUCCESS;
}
+#endif
return FAILURE;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
