manoj 99/09/20 13:47:19
Modified: src CHANGES
src/main http_main.c
src/os/tpf os.h
src/os/tpf/samples linkdll.jcl
Log:
Update for the next release of the TPF OS (PUT11)
Submitted by: David McCreedy <[EMAIL PROTECTED]>
Revision Changes Path
1.1433 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1432
retrieving revision 1.1433
diff -u -d -u -r1.1432 -r1.1433
--- CHANGES 1999/09/20 20:34:30 1.1432
+++ CHANGES 1999/09/20 20:46:47 1.1433
@@ -1,5 +1,8 @@
Changes with Apache 1.3.10
+ *) Update for the next release of the TPF OS (PUT11)
+ [David McCreedy <[EMAIL PROTECTED]>]
+
*) Add some compile-time flags to the output when -V is used for TPF
[David McCreedy <[EMAIL PROTECTED]>]
1.477 +12 -12 apache-1.3/src/main/http_main.c
Index: http_main.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.476
retrieving revision 1.477
diff -u -d -u -r1.476 -r1.477
--- http_main.c 1999/09/20 20:34:37 1.476
+++ http_main.c 1999/09/20 20:46:59 1.477
@@ -4711,9 +4711,9 @@
#endif
#ifdef TPF
- APACHE_TPF_INPUT input_parms;
+ EBW_AREA input_parms;
ecbptr()->ebrout = PRIMECRAS;
- input_parms = * (APACHE_TPF_INPUT *)(&(ecbptr()->ebw000));
+ input_parms = * (EBW_AREA *)(&(ecbptr()->ebw000));
#endif
MONCONTROL(0);
@@ -4778,7 +4778,7 @@
break;
#ifdef TPF
case 'x':
- os_tpf_child(&input_parms);
+ os_tpf_child(&input_parms.child);
set_signals();
break;
#endif
@@ -4838,7 +4838,8 @@
#else
if (ap_standalone) {
if(!tpf_child) {
- memcpy(tpf_server_name, input_parms.inetd_server.servname,
INETD_SERVNAME_LENGTH);
+ memcpy(tpf_server_name, input_parms.parent.servname,
+ INETD_SERVNAME_LENGTH);
tpf_server_name[INETD_SERVNAME_LENGTH+1] = '\0';
ap_open_logs(server_conf, pconf);
}
@@ -4847,15 +4848,16 @@
version_locked++;
if(tpf_child) {
copy_listeners(pconf);
- reset_tpf_listeners(&input_parms);
+ reset_tpf_listeners(&input_parms.child);
server_conf->error_log = NULL;
#ifdef SCOREBOARD_FILE
- scoreboard_fd = input_parms.scoreboard_fd;
+ scoreboard_fd = input_parms.child.scoreboard_fd;
ap_scoreboard_image = &_scoreboard_image;
#else /* must be USE_TPF_SCOREBOARD or USE_SHMGET_SCOREBOARD */
- ap_scoreboard_image = (scoreboard *)input_parms.scoreboard_heap;
+ ap_scoreboard_image =
+ (scoreboard *)input_parms.child.scoreboard_heap;
#endif
- child_main(input_parms.slot);
+ child_main(input_parms.child.slot);
}
else
STANDALONE_MAIN(argc, argv);
@@ -4902,10 +4904,8 @@
}
#ifdef TPF
-/* TPF only passes the incoming socket number from the internet daemon
- in ebw000 */
- sock_in = * (int*)(&(ecbptr()->ebw000));
- sock_out = * (int*)(&(ecbptr()->ebw000));
+/* TPF's Internet Daemon passes the incoming socket nbr (inetd mode only) */
+ sock_in = sock_out = input_parms.parent.socket;
/* TPF also needs a signal set for alarm in inetd mode */
signal(SIGALRM, alrm_handler);
#elif defined(MPE)
1.10 +6 -4 apache-1.3/src/os/tpf/os.h
Index: os.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/os/tpf/os.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -u -r1.9 -r1.10
--- os.h 1999/09/01 04:29:05 1.9
+++ os.h 1999/09/20 20:47:08 1.10
@@ -92,8 +92,7 @@
}TPF_FD_LIST;
#include <i$netd.h>
-struct apache_input {
- INETD_SERVER_INPUT inetd_server;
+typedef struct apache_input {
void *scoreboard_heap; /* scoreboard system heap
address */
int scoreboard_fd; /* scoreboard file descriptor */
int slot; /* child number */
@@ -102,9 +101,12 @@
time_t restart_time;
TPF_FD_LIST *tpf_fds; /* fd inheritance table ptr */
void *shm_static_ptr; /* shm ptr for static pages */
-};
+}APACHE_TPF_INPUT;
-typedef struct apache_input APACHE_TPF_INPUT;
+typedef union ebw_area {
+ INETD_SERVER_INPUT parent;
+ APACHE_TPF_INPUT child;
+}EBW_AREA;
extern void *tpf_shm_static_ptr; /* mod_tpf_shm_static */
#define TPF_SHM_STATIC_SIZE 200000
1.3 +1 -1 apache-1.3/src/os/tpf/samples/linkdll.jcl
Index: linkdll.jcl
===================================================================
RCS file: /home/cvs/apache-1.3/src/os/tpf/samples/linkdll.jcl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -u -r1.2 -r1.3
--- linkdll.jcl 1999/09/01 04:29:07 1.2
+++ linkdll.jcl 1999/09/20 20:47:14 1.3
@@ -20,7 +20,7 @@
//PLKED.OBJ06 DD PATH='/<your-path-here>/src/ap/ap_getpass.o'
//PLKED.OBJ07 DD PATH='/<your-path-here>/src/ap/ap_md5c.o'
//PLKED.OBJ08 DD PATH='/<your-path-here>/src/ap/ap_sha1.o'
-//PLKED.OBJ09 DD PATH='/<your-path-here>/src/ap/ap_signal.o'
+//PLKED.OBJ09 DD PATH='/<your-path-here>/src/ap/ap_signal.o'
//PLKED.OBJ10 DD PATH='/<your-path-here>/src/ap/ap_slack.o'
//PLKED.OBJ11 DD PATH='/<your-path-here>/src/ap/ap_snprintf.o'
//PLKED.OBJ12 DD PATH='/<your-path-here>/src/buildmark.o'
