You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mc...@apache.org on 2002/12/23 18:27:47 UTC
cvs commit: apache-1.3/src/main alloc.c util_uri.c
mccreedy 2002/12/23 09:27:47
Modified: src/main alloc.c util_uri.c
Log:
TPF-specific patch to skip fcntl() on sockets.
Revision Changes Path
1.139 +3 -0 apache-1.3/src/main/alloc.c
Index: alloc.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/main/alloc.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- alloc.c 23 Dec 2002 16:12:41 -0000 1.138
+++ alloc.c 23 Dec 2002 17:27:46 -0000 1.139
@@ -2103,6 +2103,9 @@
API_EXPORT(void) ap_note_cleanups_for_socket_ex(pool *p, int fd, int domagic)
{
+#ifdef TPF
+ domagic = 0; /* skip magic (fcntl) for TPF sockets, at least for now */
+#endif
ap_register_cleanup_ex(p, (void *) (long) fd, socket_cleanup,
socket_cleanup,
domagic ? socket_magic_cleanup : NULL);
1.40 +5 -0 apache-1.3/src/main/util_uri.c
Index: util_uri.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/main/util_uri.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- util_uri.c 18 Jun 2002 00:59:58 -0000 1.39
+++ util_uri.c 23 Dec 2002 17:27:46 -0000 1.40
@@ -163,7 +163,12 @@
*/
API_EXPORT(struct hostent *) ap_pgethostbyname(pool *p, const char *hostname)
{
+#ifdef TPF
+ /* get rid of compilation warning on TPF */
+ struct hostent *hp = gethostbyname((char *)hostname);
+#else
struct hostent *hp = gethostbyname(hostname);
+#endif
return (hp == NULL) ? NULL : ap_pduphostent(p, hp);
}