Mail Archives: cygwin/1996/12/12/06:30:36
diff -rc /apache/src/Configure /apache/src.nt/Configure
*** /apache/src/Configure Thu Dec 12 14:34:35 1996
--- /apache/src.nt/Configure Tue Dec 10 09:44:17 1996
***************
*** 139,144 ****
--- 139,149 ----
DBM_LIB="-ldbm"
case "$PLAT" in
+ *-CYGWIN32*)
+ DEF_WANTHSREGEX=yes
+ OS='CYGWIN32'
+ CFLAGS="$CFLAGS -DCYGWIN32"
+ ;;
*-apple-aux3*)
OS='A/UX 3.1.x'
CFLAGS="$CFLAGS -DAUX -D_POSIX_SOURCE"
Only in /apache/src.nt: Makefile
Only in /apache/src.nt: Makefile.bak
diff -rc /apache/src/alloc.c /apache/src.nt/alloc.c
*** /apache/src/alloc.c Thu Dec 12 14:34:35 1996
--- /apache/src.nt/alloc.c Tue Dec 10 12:58:11 1996
***************
*** 951,957 ****
if (pipe_out) {
close (out_fds[1]);
! #ifdef __EMX__
/* Need binary mode set for OS/2. */
*pipe_out = fdopen (out_fds[0], "rb");
#else
--- 951,957 ----
if (pipe_out) {
close (out_fds[1]);
! #if defined(__EMX__) || defined(CYGWIN32)
/* Need binary mode set for OS/2. */
*pipe_out = fdopen (out_fds[0], "rb");
#else
***************
*** 963,969 ****
if (pipe_in) {
close (in_fds[0]);
! #ifdef __EMX__
/* Need binary mode set for OS/2 */
*pipe_in = fdopen (in_fds[1], "wb");
#else
--- 963,969 ----
if (pipe_in) {
close (in_fds[0]);
! #if defined(__EMX__) || defined(CYGWIN32)
/* Need binary mode set for OS/2 */
*pipe_in = fdopen (in_fds[1], "wb");
#else
***************
*** 975,981 ****
if (pipe_err) {
close (err_fds[1]);
! #ifdef __EMX__
/* Need binary mode set for OS/2. */
*pipe_err = fdopen (err_fds[0], "rb");
#else
--- 975,981 ----
if (pipe_err) {
close (err_fds[1]);
! #if defined(__EMX__) || defined(CYGWIN32)
/* Need binary mode set for OS/2. */
*pipe_err = fdopen (err_fds[0], "rb");
#else
Only in /apache/src.nt: builderror
diff -rc /apache/src/conf.h /apache/src.nt/conf.h
*** /apache/src/conf.h Thu Dec 12 14:34:35 1996
--- /apache/src.nt/conf.h Tue Dec 10 21:27:59 1996
***************
*** 212,217 ****
--- 212,232 ----
#define USE_FCNTL_SERIALIZED_ACCEPT
#include <sys/time.h>
+ #elif defined(CYGWIN32)
+ #undef HAVE_GMTOFF
+ #define NO_KILLPG
+ #undef NO_SETSID
+ #undef NEED_STRDUP
+ #define JMP_BUF jmp_buf
+ #undef USE_FCNTL_SERIALIZED_ACCEPT
+ #include <sys/time.h>
+ #define SIGURG SIGUSR2
+ #define USE_LONGJMP
+ #define NEED_INITGROUPS
+ #undef MULTIPLE_GROUPS
+ #define BROKEN_WAIT
+ #define NO_USE_SIGACTION
+
#elif defined(SCO)
#undef HAVE_GMTOFF
#undef NO_KILLPG
Only in /apache/src.nt: emx.txt
diff -rc /apache/src/http_core.c /apache/src.nt/http_core.c
*** /apache/src/http_core.c Thu Dec 12 14:34:35 1996
--- /apache/src.nt/http_core.c Tue Dec 10 12:59:39 1996
***************
*** 1261,1267 ****
|| (errstatus = set_content_length (r, r->finfo.st_size)))
return errstatus;
! #ifdef __EMX__
/* Need binary mode for OS/2 */
f = fopen (r->filename, "rb");
#else
--- 1261,1267 ----
|| (errstatus = set_content_length (r, r->finfo.st_size)))
return errstatus;
! #if defined(__EMX__) || defined(CYGWIN32)
/* Need binary mode for OS/2 */
f = fopen (r->filename, "rb");
#else
diff -rc /apache/src/http_main.c /apache/src.nt/http_main.c
*** /apache/src/http_main.c Thu Dec 12 14:34:35 1996
--- /apache/src.nt/http_main.c Thu Dec 12 14:38:39 1996
***************
*** 105,111 ****
--- 105,113 ----
#include <sys/audit.h>
#include <prot.h>
#endif
+ #ifndef CYGWIN32
#include <netinet/tcp.h>
+ #endif
#include "explain.h"
***************
*** 190,196 ****
exit (1);
}
! lock_fd = popenf(p, lock_fname, O_CREAT | O_WRONLY, 0644);
if (lock_fd == -1)
{
perror ("open");
--- 192,198 ----
exit (1);
}
! lock_fd = popenf(p, lock_fname, O_CREAT | O_WRONLY | O_BINARY , 0666);
if (lock_fd == -1)
{
perror ("open");
***************
*** 673,678 ****
--- 675,682 ----
/* Called by parent process */
void reinit_scoreboard (pool *p)
{
+ mode_t old_mask;
+
int exit_gen=0;
if(scoreboard_image)
exit_gen=scoreboard_image->global.exit_generation;
***************
*** 689,697 ****
have_scoreboard_fname = 1;
! #ifdef __EMX__
/* OS/2 needs binary mode set. */
scoreboard_fd = popenf(p, scoreboard_fname, O_CREAT|O_BINARY|O_RDWR, 0644);
#else
scoreboard_fd = popenf(p, scoreboard_fname, O_CREAT|O_RDWR, 0644);
#endif
--- 693,704 ----
have_scoreboard_fname = 1;
! #if defined(__EMX__) || defined(CYGWIN32)
/* OS/2 needs binary mode set. */
+ old_mask = umask(0666);
scoreboard_fd = popenf(p, scoreboard_fname, O_CREAT|O_BINARY|O_RDWR, 0644);
+ perror (scoreboard_fname);
+ umask(old_mask);
#else
scoreboard_fd = popenf(p, scoreboard_fname, O_CREAT|O_RDWR, 0644);
#endif
***************
*** 712,723 ****
/* called by child */
void reopen_scoreboard (pool *p)
{
#if !defined(HAVE_MMAP) && !defined(HAVE_SHMGET)
if (scoreboard_fd != -1) pclosef (p, scoreboard_fd);
! #ifdef __EMX__
/* OS/2 needs binary mode set. */
! scoreboard_fd = popenf(p, scoreboard_fname, O_CREAT|O_BINARY|O_RDWR, 0666);
#else
scoreboard_fd = popenf(p, scoreboard_fname, O_CREAT|O_RDWR, 0666);
#endif
--- 719,739 ----
/* called by child */
void reopen_scoreboard (pool *p)
{
+ mode_t old_mask;
+
#if !defined(HAVE_MMAP) && !defined(HAVE_SHMGET)
if (scoreboard_fd != -1) pclosef (p, scoreboard_fd);
+ perror (scoreboard_fname);
+ errno = EINTR;
! #if defined(__EMX__) || defined(CYGWIN32)
/* OS/2 needs binary mode set. */
! old_mask = umask(0666);
! scoreboard_fd = popenf(p, scoreboard_fname, O_CREAT|O_BINARY|O_RDWR, 0644);
! perror (scoreboard_fname);
! errno = EINTR;
! /* era scoreboard_fd = popenf(p, scoreboard_fname, O_CREAT|O_BINARY|O_RDWR, 0666); */
! umask(old_mask);
#else
scoreboard_fd = popenf(p, scoreboard_fname, O_CREAT|O_RDWR, 0666);
#endif
***************
*** 754,759 ****
--- 770,776 ----
lseek (scoreboard_fd, 0L, 0);
force_read (scoreboard_fd, (char*)scoreboard_image,
sizeof(*scoreboard_image));
+
#endif
}
***************
*** 806,811 ****
--- 823,829 ----
force_write (scoreboard_fd, (char*)&new_score_rec, sizeof(short_score));
#endif
+
return old_status;
}
***************
*** 998,1004 ****
static int ntimes;
#endif
! #if defined(NEXT)
if (setjmp(wait_timeout_buf) != 0) {
#else
if (sigsetjmp(wait_timeout_buf, 1) != 0) {
--- 1016,1022 ----
static int ntimes;
#endif
! #if defined(NEXT)|| defined(USE_LONGJMP)
if (setjmp(wait_timeout_buf) != 0) {
#else
if (sigsetjmp(wait_timeout_buf, 1) != 0) {
***************
*** 1056,1062 ****
exit(1);
}
#else
! #ifdef __EMX__
/* OS/2 doesn't support process group IDs */
pgrp=getpid();
#else
--- 1074,1080 ----
exit(1);
}
#else
! #if defined(__EMX__) || defined(CYGWIN32)
/* OS/2 doesn't support process group IDs */
pgrp=getpid();
#else
***************
*** 1099,1104 ****
--- 1117,1123 ----
void just_die() /* SIGHUP to child process??? */
{
+ log_error("httpd: just_die()", server_conf);
exit (0);
}
***************
*** 1133,1139 ****
name = ent->pw_name;
} else name = user_name;
! #ifndef __EMX__
/* OS/2 dosen't support groups. */
/* Reset `groups' attributes. */
--- 1152,1158 ----
name = ent->pw_name;
} else name = user_name;
! #if defined(__EMX__) || defined(CYGWIN32)
/* OS/2 dosen't support groups. */
/* Reset `groups' attributes. */
***************
*** 1148,1158 ****
--- 1167,1179 ----
exit (1);
}
#endif
+ #ifndef CYGWIN32
if (setgid(group_id) == -1) {
log_unixerr("setgid", NULL, "unable to set group id", server_conf);
exit (1);
}
#endif
+ #endif
}
}
***************
*** 1426,1442 ****
(void)update_child_status (child_num, SERVER_READY, (request_rec*)NULL);
/* Only try to switch if we're running as root */
if(!geteuid() && setuid(user_id) == -1) {
log_unixerr("setuid", NULL, "unable to change uid", server_conf);
exit (1);
}
! #ifdef NEXT
setjmp(jmpbuffer);
#else
sigsetjmp(jmpbuffer,1);
#endif
! #ifndef __EMX__
signal(SIGURG, timeout);
#endif
--- 1447,1465 ----
(void)update_child_status (child_num, SERVER_READY, (request_rec*)NULL);
/* Only try to switch if we're running as root */
+ #ifndef CYGWIN32
if(!geteuid() && setuid(user_id) == -1) {
log_unixerr("setuid", NULL, "unable to change uid", server_conf);
exit (1);
}
+ #endif
! #if defined(NEXT) || defined(USE_LONGJMP)
setjmp(jmpbuffer);
#else
sigsetjmp(jmpbuffer,1);
#endif
! #ifndef __EMX__ /* ANCHE CYGWIN32? */
signal(SIGURG, timeout);
#endif
***************
*** 1502,1515 ****
{
fd_set fds;
memset(&fds,0,sizeof fds);
FD_SET(sd,&fds);
-
do
! #ifdef HPUX
csd = select(sd+1, (int*)&fds, NULL, NULL, NULL);
#else
csd = select(sd+1, &fds, NULL, NULL, NULL);
#endif
while(csd < 0 && errno == EINTR);
--- 1525,1547 ----
{
fd_set fds;
+ #ifdef CYGWIN32
+ /*
+ errno=EINTR;
+ */
+ #endif
memset(&fds,0,sizeof fds);
FD_SET(sd,&fds);
do
! #ifdef HPUX /* era HPUX */
csd = select(sd+1, (int*)&fds, NULL, NULL, NULL);
#else
+ {
csd = select(sd+1, &fds, NULL, NULL, NULL);
+ #ifdef CYGWIN32
+ sleep(1);
+ #endif
+ }
#endif
while(csd < 0 && errno == EINTR);
***************
*** 1518,1528 ****
log_unixerr("select","(listen)",NULL,server_conf);
exit(0);
}
- /*fprintf(stderr,"%d check(2a) %d %d\n",getpid(),scoreboard_image->global.exit_generation,generation);*/
sync_scoreboard_image();
if(scoreboard_image->global.exit_generation >= generation)
exit(0);
-
while ((csd=accept(sd, &sa_client, &clen)) == -1)
if (errno != EINTR)
log_unixerr("accept",NULL,"socket error: accept failed", server_conf);
--- 1550,1558 ----
***************
*** 1594,1599 ****
--- 1624,1630 ----
close (conn_io->fd);
#endif
}
+
}
void make_child(server_rec *server_conf, int child_num)
***************
*** 1694,1705 ****
--- 1725,1738 ----
*
* If no size is specified, use the kernel default.
*/
+ #ifndef CYGWIN32
if (server_conf->send_buffer_size) {
if((setsockopt(s, SOL_SOCKET, SO_SNDBUF, (char*)&server_conf->send_buffer_size, sizeof(int))) < 0) {
perror("setsockopt(SO_SNDBUF), using default buffer size");
/* Fail soft. */
}
}
+ #endif
if(bind(s, (struct sockaddr *)server,sizeof(struct sockaddr_in)) == -1)
{
***************
*** 1781,1787 ****
if (!one_process) detach();
! #ifdef NEXT
setjmp(restart_buffer);
#else
sigsetjmp(restart_buffer,1);
--- 1814,1820 ----
if (!one_process) detach();
! #if defined(NEXT) || defined(USE_LONGJMP)
setjmp(restart_buffer);
#else
sigsetjmp(restart_buffer,1);
***************
*** 1796,1802 ****
#ifndef NO_KILLPG
if (killpg(pgrp,SIGHUP) < 0) /* Kill 'em off */
#else
! if (kill(-pgrp,SIGHUP) < 0)
#endif
log_unixerr ("killpg SIGHUP", NULL, NULL, server_conf);
}
--- 1829,1835 ----
#ifndef NO_KILLPG
if (killpg(pgrp,SIGHUP) < 0) /* Kill 'em off */
#else
! if (kill(pgrp,SIGHUP) < 0) /* era meno pgrp CYGWIN32 */
#endif
log_unixerr ("killpg SIGHUP", NULL, NULL, server_conf);
}
***************
*** 1990,2000 ****
--- 2023,2035 ----
set_group_privs();
default_server_hostnames (server_conf);
+ #ifndef CYGWIN32
/* Only try to switch if we're running as root */
if(!geteuid() && setuid(user_id) == -1) {
log_unixerr("setuid", NULL, "unable to change uid", server_conf);
exit (1);
}
+ #endif
c = sizeof(sa_client);
if ((getpeername(fileno(stdin), &sa_client, &c)) < 0)
Only in /apache/src.nt: modules.c
Only in /apache/src.nt: modules.c.bak
Only in /apache/src.nt/regex: engine.ih
Only in /apache/src.nt/regex: libregex.a
diff -rc /apache/src/regex/mkh /apache/src.nt/regex/mkh
*** /apache/src/regex/mkh Thu Dec 12 14:34:37 1996
--- /apache/src.nt/regex/mkh Tue Dec 10 09:53:07 1996
***************
*** 1,6 ****
#! /bin/sh
# mkh - pull headers out of C source
! PATH=/bin:/usr/bin ; export PATH
# egrep pattern to pick out marked lines
egrep='^ =([ ]|$)'
--- 1,6 ----
#! /bin/sh
# mkh - pull headers out of C source
! # giovanni PATH=/bin:/usr/bin ; export PATH
# egrep pattern to pick out marked lines
egrep='^ =([ ]|$)'
Only in /apache/src.nt/regex: regcomp.ih
Only in /apache/src.nt/regex: regcomp.o
Only in /apache/src.nt/regex: regerror.ih
Only in /apache/src.nt/regex: regerror.o
Only in /apache/src.nt/regex: regexec.o
Only in /apache/src.nt/regex: regfree.o
diff -rc /apache/src/util.c /apache/src.nt/util.c
*** /apache/src/util.c Thu Dec 12 14:34:37 1996
--- /apache/src.nt/util.c Tue Dec 10 10:28:03 1996
***************
*** 1016,1022 ****
#ifdef NEED_INITGROUPS
int initgroups(const char *name, gid_t basegid)
{
! #ifdef QNX
/* QNX does not appear to support supplementary groups.
Ben <ben AT algroup DOT co DOT uk> */
return 0;
--- 1016,1022 ----
#ifdef NEED_INITGROUPS
int initgroups(const char *name, gid_t basegid)
{
! #if defined(QNX) || defined(CYGWIN32)
/* QNX does not appear to support supplementary groups.
Ben <ben AT algroup DOT co DOT uk> */
return 0;
-
For help on using this list, send a message to
"gnu-win32-request AT cygnus DOT com" with one line of text: "help".
- Raw text -