OK, didn't take the attachment.
I tried putting them in a zip file and it still didn't take. So here's the other one (diff for mod_frontpage.c):
59d58
< #include <stdlib.h>
66c65
< /*#include "apr_compat.h" bk: ignore */
---
> #include "apr_compat.h"
318,352d316
< static int get_random_nodev()
< {
< static int initialized = 0;
<
< if (!initialized) {
< int i;
<
< srandom(time(NULL));
< for (i = time(NULL) % 10; i > 0; i--) {
< random();
< }
< initialized = 1;
< }
<
< return random() >> (sizeof(long int) - sizeof(int));
< }
<
<
< static int get_random()
< {
< int fd;
< int result;
<
< if ((fd = open("/dev/urandom", O_RDONLY)) == -1) {
< return get_random_nodev();
< }
<
< if (read(fd, (void*)&result, sizeof(int)) < sizeof(int)) {
< close(fd);
< return get_random_nodev();
< }
<
< close(fd);
< return result;
< }
383d346
< #if 0
500d462
< #endif
502d463
< iRandom[2] = get_random();
823c784
< * Note: apr_pstrdup allocates memory, but it checks for out of memory
---
> * Note: ap_pstrdup allocates memory, but it checks for out of memory
826,827c787,788
< r->handler = apr_pstrdup(r->pool, "cgi-script");
< apr_table_set(r->notes, "alias-forced-type", r->handler);
---
> r->handler = ap_pstrdup(r->pool, "cgi-script");
> ap_table_set(r->notes, "alias-forced-type", r->handler);
829c790
< apr_table_set(r->subprocess_env, "FPEXE", apr_pstrdup(r->pool, szFpexe));
---
> ap_table_set(r->subprocess_env, "FPEXE", ap_pstrdup(r->pool, szFpexe));
831c792
< apr_table_set(r->subprocess_env, "FPUID", apr_pstrdup(r->pool, szBuf));
---
> ap_table_set(r->subprocess_env, "FPUID", ap_pstrdup(r->pool, szBuf));
833c794
< apr_table_set(r->subprocess_env, "FPGID", apr_pstrdup(r->pool, szBuf));
---
> ap_table_set(r->subprocess_env, "FPGID", ap_pstrdup(r->pool, szBuf));
835,836c796,797
< apr_table_set(r->notes,"FPexecfilename", apr_pstrcat(r->pool, FPSTUB, NULL));
< r->filename = apr_pstrcat(r->pool, r->filename, szCgi, NULL);
---
> ap_table_set(r->notes,"FPexecfilename", ap_pstrcat(r->pool, FPSTUB, NULL));
> r->filename = ap_pstrcat(r->pool, r->filename, szCgi, NULL);
878,879c839,840
< execFilename = apr_pstrcat(r->pool, FP, szDir, szBuf, szBase, NULL);
< apr_table_set(r->notes,"FPexecfilename", execFilename);
---
> execFilename = ap_pstrcat(r->pool, FP, szDir, szBuf, szBase, NULL);
> ap_table_set(r->notes,"FPexecfilename", execFilename);
981c942
< if (!apr_table_get(r->notes, "FPexecfilename"))
---
> if (!ap_table_get(r->notes, "FPexecfilename"))
985c946
< if (apr_table_get(r->notes,"FPexecfilename"))
---
> if (ap_table_get(r->notes,"FPexecfilename"))
987c948
< r->filename = (char*) apr_table_get(r->notes,"FPexecfilename");
---
> r->filename = (char*) ap_table_get(r->notes,"FPexecfilename");
I tried putting them in a zip file and it still didn't take. So here's the other one (diff for mod_frontpage.c):
59d58
< #include <stdlib.h>
66c65
< /*#include "apr_compat.h" bk: ignore */
---
> #include "apr_compat.h"
318,352d316
< static int get_random_nodev()
< {
< static int initialized = 0;
<
< if (!initialized) {
< int i;
<
< srandom(time(NULL));
< for (i = time(NULL) % 10; i > 0; i--) {
< random();
< }
< initialized = 1;
< }
<
< return random() >> (sizeof(long int) - sizeof(int));
< }
<
<
< static int get_random()
< {
< int fd;
< int result;
<
< if ((fd = open("/dev/urandom", O_RDONLY)) == -1) {
< return get_random_nodev();
< }
<
< if (read(fd, (void*)&result, sizeof(int)) < sizeof(int)) {
< close(fd);
< return get_random_nodev();
< }
<
< close(fd);
< return result;
< }
383d346
< #if 0
500d462
< #endif
502d463
< iRandom[2] = get_random();
823c784
< * Note: apr_pstrdup allocates memory, but it checks for out of memory
---
> * Note: ap_pstrdup allocates memory, but it checks for out of memory
826,827c787,788
< r->handler = apr_pstrdup(r->pool, "cgi-script");
< apr_table_set(r->notes, "alias-forced-type", r->handler);
---
> r->handler = ap_pstrdup(r->pool, "cgi-script");
> ap_table_set(r->notes, "alias-forced-type", r->handler);
829c790
< apr_table_set(r->subprocess_env, "FPEXE", apr_pstrdup(r->pool, szFpexe));
---
> ap_table_set(r->subprocess_env, "FPEXE", ap_pstrdup(r->pool, szFpexe));
831c792
< apr_table_set(r->subprocess_env, "FPUID", apr_pstrdup(r->pool, szBuf));
---
> ap_table_set(r->subprocess_env, "FPUID", ap_pstrdup(r->pool, szBuf));
833c794
< apr_table_set(r->subprocess_env, "FPGID", apr_pstrdup(r->pool, szBuf));
---
> ap_table_set(r->subprocess_env, "FPGID", ap_pstrdup(r->pool, szBuf));
835,836c796,797
< apr_table_set(r->notes,"FPexecfilename", apr_pstrcat(r->pool, FPSTUB, NULL));
< r->filename = apr_pstrcat(r->pool, r->filename, szCgi, NULL);
---
> ap_table_set(r->notes,"FPexecfilename", ap_pstrcat(r->pool, FPSTUB, NULL));
> r->filename = ap_pstrcat(r->pool, r->filename, szCgi, NULL);
878,879c839,840
< execFilename = apr_pstrcat(r->pool, FP, szDir, szBuf, szBase, NULL);
< apr_table_set(r->notes,"FPexecfilename", execFilename);
---
> execFilename = ap_pstrcat(r->pool, FP, szDir, szBuf, szBase, NULL);
> ap_table_set(r->notes,"FPexecfilename", execFilename);
981c942
< if (!apr_table_get(r->notes, "FPexecfilename"))
---
> if (!ap_table_get(r->notes, "FPexecfilename"))
985c946
< if (apr_table_get(r->notes,"FPexecfilename"))
---
> if (ap_table_get(r->notes,"FPexecfilename"))
987c948
< r->filename = (char*) apr_table_get(r->notes,"FPexecfilename");
---
> r->filename = (char*) ap_table_get(r->notes,"FPexecfilename");