fielding 97/05/26 20:57:20
Modified: src CHANGES http_main.c
Log:
The OS/2 handling of process group was broken by a porting patch for MPE
(rev 1.116), so I restored the prior code for OS/2 and cleaned up the
compiler conditionals.
Submitted by: Roy Fielding and Garey Smiley
Revision Changes Path
1.278 +3 -0 apache/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.277
retrieving revision 1.278
diff -C3 -r1.277 -r1.278
*** CHANGES 1997/05/15 23:40:11 1.277
--- CHANGES 1997/05/27 03:57:18 1.278
***************
*** 1,5 ****
--- 1,8 ----
Changes with Apache 1.2
+ *) The OS/2 handling of process group was broken by a porting patch for
+ MPE, so restored prior code for OS/2. [Roy Fielding and Garey Smiley]
+
*) Inherit virtual server port from main server if none (or "*") is
given for VirtualHost. [Dean Gaudet] PR#576
1.145 +6 -7 apache/src/http_main.c
Index: http_main.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_main.c,v
retrieving revision 1.144
retrieving revision 1.145
diff -C3 -r1.144 -r1.145
*** http_main.c 1997/05/13 03:44:23 1.144
--- http_main.c 1997/05/27 03:57:18 1.145
***************
*** 1373,1388 ****
fprintf(stderr,"httpd: setsid failed\n");
exit(1);
}
! #else
! #if defined(NEXT)
if(setpgrp(0,getpid()) == -1 || (pgrp = getpgrp(0)) == -1) {
perror("setpgrp");
fprintf(stderr,"httpd: setpgrp or getpgrp failed\n");
exit(1);
}
! #else
! #if defined(__EMX__) || defined(MPE)
! /* OS/2 and MPE don't support process group IDs */
pgrp=-getpid();
#else
if((pgrp=setpgrp(getpid(),0)) == -1) {
--- 1373,1389 ----
fprintf(stderr,"httpd: setsid failed\n");
exit(1);
}
! #elif defined(NEXT)
if(setpgrp(0,getpid()) == -1 || (pgrp = getpgrp(0)) == -1) {
perror("setpgrp");
fprintf(stderr,"httpd: setpgrp or getpgrp failed\n");
exit(1);
}
! #elif defined(__EMX__)
! /* OS/2 doesn't support process group IDs */
! pgrp=getpid();
! #elif defined(MPE)
! /* MPE uses negative pid for process group */
pgrp=-getpid();
#else
if((pgrp=setpgrp(getpid(),0)) == -1) {
***************
*** 1390,1397 ****
fprintf(stderr,"httpd: setpgrp failed\n");
exit(1);
}
- #endif
- #endif
#endif
}
--- 1391,1396 ----
