diff options
Diffstat (limited to 'www/mod_perl/files')
| -rw-r--r-- | www/mod_perl/files/patch-Makefile.PL | 14 | ||||
| -rw-r--r-- | www/mod_perl/files/patch-src:modules:perl:Connection.xs | 39 | ||||
| -rw-r--r-- | www/mod_perl/files/patch-src__modules__perl__mod_perl.c | 19 |
3 files changed, 0 insertions, 72 deletions
diff --git a/www/mod_perl/files/patch-Makefile.PL b/www/mod_perl/files/patch-Makefile.PL deleted file mode 100644 index 6e82ef6f2e4a..000000000000 --- a/www/mod_perl/files/patch-Makefile.PL +++ /dev/null @@ -1,14 +0,0 @@ ---- Makefile.PL.orig Wed Apr 18 22:00:41 2007 -+++ Makefile.PL Wed Apr 18 22:01:40 2007 -@@ -1380,7 +1380,10 @@ - my $string = $self->MM::install; - my $add = ""; - if ($USE_APXS) { -- $add = "apxs_install"; -+ # XXX The FreeBSD port for mod_perl takes care of installing libperl.so -+ # itself via the pkg-install script. -+ # -+ # $add = "apxs_install"; - } - elsif ($win32_auto and - ($win32_args{INSTALL_DLL} or $win32_args{INSTALL_LIB})) { diff --git a/www/mod_perl/files/patch-src:modules:perl:Connection.xs b/www/mod_perl/files/patch-src:modules:perl:Connection.xs deleted file mode 100644 index 22eea28838da..000000000000 --- a/www/mod_perl/files/patch-src:modules:perl:Connection.xs +++ /dev/null @@ -1,39 +0,0 @@ ---- src/modules/perl/Connection.xs.orig Fri Nov 23 06:19:44 2001 -+++ src/modules/perl/Connection.xs Fri Nov 23 10:29:44 2001 -@@ -78,7 +78,11 @@ - RETVAL = newSVpv((char *)&conn->remote_addr, - sizeof conn->remote_addr); - if(sv_addr) { -+#ifdef APACHE6 -+ struct sockaddr_storage addr; -+#else - struct sockaddr_in addr; -+#endif - STRLEN sockaddrlen; - char * new_addr = SvPV(sv_addr,sockaddrlen); - if (sockaddrlen != sizeof(addr)) { -@@ -106,7 +110,26 @@ - #else - conn->remote_ip = pstrdup(conn->pool, (char *)SvPV(ST(1),na)); - #endif -+#ifdef APACHE6 -+ { -+ struct addrinfo hints, *res0; -+ int error; -+ -+ memset(&hints, 0, sizeof(hints)); -+ hints.ai_family = PF_UNSPEC; -+ hints.ai_flags = AI_NUMERICHOST; -+ error = getaddrinfo(conn->remote_ip, NULL, &hints, &res0); -+ if (!error) { -+ memcpy(&conn->remote_addr, res0->ai_addr, res0->ai_addrlen); -+ freeaddrinfo(res0); -+ } else { -+ croak("Bad ip address in remote_ip getaddrinfo failed %s", -+ gai_strerror(error)); -+ } -+ } -+#else - conn->remote_addr.sin_addr.s_addr = inet_addr(conn->remote_ip); -+#endif - } diff --git a/www/mod_perl/files/patch-src__modules__perl__mod_perl.c b/www/mod_perl/files/patch-src__modules__perl__mod_perl.c deleted file mode 100644 index 285d0c7ed814..000000000000 --- a/www/mod_perl/files/patch-src__modules__perl__mod_perl.c +++ /dev/null @@ -1,19 +0,0 @@ ---- ./src/modules/perl/mod_perl.c.orig 2008-11-20 13:12:31.000000000 -0500 -+++ ./src/modules/perl/mod_perl.c 2009-06-05 02:07:17.882792245 -0400 -@@ -596,6 +596,7 @@ - void perl_startup (server_rec *s, pool *p) - { - char *argv[] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL }; -+ char **temp_argv=argv; - char **entries, *dstr; - int status, i, argc=1; - dPSRV(s); -@@ -679,7 +680,7 @@ - MP_TRACE_g(fprintf(stderr, "...")); - - #ifdef PERL_SYS_INIT -- PERL_SYS_INIT(&argc,(char***)&argv); -+ PERL_SYS_INIT(&argc,(char***)&temp_argv); - #endif - - #ifndef perl_init_i18nl10n |