sas Sat Oct 26 11:47:23 2002 EDT
Modified files:
/php4/sapi/thttpd thttpd.c
Log:
some system headers (irix) define sa_len
prefix sa_len with x
Index: php4/sapi/thttpd/thttpd.c
diff -u php4/sapi/thttpd/thttpd.c:1.70 php4/sapi/thttpd/thttpd.c:1.71
--- php4/sapi/thttpd/thttpd.c:1.70 Thu Oct 24 21:10:50 2002
+++ php4/sapi/thttpd/thttpd.c Sat Oct 26 11:47:22 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: thttpd.c,v 1.70 2002/10/25 01:10:50 sas Exp $ */
+/* $Id: thttpd.c,v 1.71 2002/10/26 15:47:22 sas Exp $ */
#include "php.h"
#include "SAPI.h"
@@ -282,7 +282,7 @@
{
char buf[BUF_SIZE + 1];
char *p;
- int sa_len;
+ int xsa_len;
php_register_variable("PHP_SELF", SG(request_info).request_uri,
track_vars_array TSRMLS_CC);
php_register_variable("SERVER_SOFTWARE", SERVER_SOFTWARE, track_vars_array
TSRMLS_CC);
@@ -299,12 +299,12 @@
#ifdef HAVE_GETNAMEINFO
switch (TG(hc)->client_addr.sa.sa_family) {
- case AF_INET: sa_len = sizeof(struct sockaddr_in); break;
- case AF_INET6: sa_len = sizeof(struct sockaddr_in6); break;
- default: sa_len = 0;
+ case AF_INET: xsa_len = sizeof(struct sockaddr_in); break;
+ case AF_INET6: xsa_len = sizeof(struct sockaddr_in6); break;
+ default: xsa_len = 0;
}
- if (getnameinfo(&TG(hc)->client_addr.sa, sa_len, buf, sizeof(buf), 0, 0,
NI_NUMERICHOST) == 0) {
+ if (getnameinfo(&TG(hc)->client_addr.sa, xsa_len, buf, sizeof(buf), 0, 0,
+NI_NUMERICHOST) == 0) {
#else
p = inet_ntoa(TG(hc)->client_addr.sa_in.sin_addr);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
