Stas Bekman wrote:
Geoffrey Young wrote:
we really ought to pin down exactly how far back we are going to support httpd/apr. since we're not 2.0 yet, we should probably just pick a version to support going forward. for instance, I'm not sure it makes sense to support 2.0.40 anymore - the back-compat stuff is starting to look ugly and I'd rather have clean code than support for httpd versions that are over a year old.
personally, I'd like to see 1.99_10 require a fairly new version, perhaps even as new as 2.0.47 - with 2.0.48 right around the corner, 2.0.47 is likely to be rather old itself by the time we release 2.0.
That sounds fine with me, but I'd suggest to consult Doug on that.
doug had no issues :)
FWIW, Apache::Request 2 requires 2.0.46.
ok, the attached patch removes support for httpd 2.0.45 and below. did I miss anything? I tested with 2.0.46 and 2.0.47 and everything compiles cleanly and tests ok.
In any case when doing the syncing we should probably log the date when it was done, so in the future we can monitor the Changes file from that date onwards.
done. have we ever tagged the CVS tree? might that make sense as well.
--Geoff
Index: Changes
===================================================================
RCS file: /home/cvspublic/modperl-2.0/Changes,v
retrieving revision 1.210
diff -u -r1.210 Changes
--- Changes 20 Aug 2003 23:53:16 -0000 1.210
+++ Changes 21 Aug 2003 14:19:03 -0000
@@ -12,12 +12,18 @@
=item 1.99_10-dev
+remove support for httpd 2.0.45/apr 0.9.3 and lower.
+httpd 2.0.46 is now the minimum supported version.
+[Geoffrey Young]
+
APR::PerlIO now accepts the pool object instead of a request/server
objects, so it can be used anywhere, including outside mod_perl [Stas]
when perl is built with perlio enabled (5.8+) the new PerlIO Apache
layer is used, so now one can push layers onto STDIN, STDOUT handles
e.g. binmode(STDOUT, ':utf8'); [Stas]
+
+add ap_table_compress() to APR::Table [Geoffrey Young]
alter stacked handler interface so that mod_perl follows Apache
as closely as possible with respect to VOID/RUN_FIRST/RUN_ALL
Index: Makefile.PL
===================================================================
RCS file: /home/cvspublic/modperl-2.0/Makefile.PL,v
retrieving revision 1.122
diff -u -r1.122 Makefile.PL
--- Makefile.PL 15 Aug 2003 23:56:16 -0000 1.122
+++ Makefile.PL 21 Aug 2003 14:19:04 -0000
@@ -6,7 +6,7 @@
# directly or via the top level Makefile.PL
$ENV{MOD_PERL_2_BUILD} = 1;
-my $min_httpd_version = '2.0.36';
+my $min_httpd_version = '2.0.46';
my($old_modperl_version, $old_modperl_pm);
Index: README
===================================================================
RCS file: /home/cvspublic/modperl-2.0/README,v
retrieving revision 1.14
diff -u -r1.14 README
--- README 6 Aug 2003 22:38:53 -0000 1.14
+++ README 21 Aug 2003 14:19:04 -0000
@@ -3,7 +3,7 @@
*** Prerequisites ***
Apache:
- This version of mod_perl works with Apache versions 2.0.36 -
+ This version of mod_perl works with Apache versions 2.0.46 -
2.0.47. Newer Apache versions may work with this version of mod_perl.
If not, the the cvs version likely will, which can be obtained from:
http://perl.apache.org/download/source.html#Development_mod_perl_2_0_Source_Distribution
Index: docs/devel/porting/porting.pod
===================================================================
RCS file: /home/cvspublic/modperl-docs/src/docs/2.0/devel/porting/porting.pod,v
retrieving revision 1.14
diff -u -r1.14 porting.pod
--- docs/devel/porting/porting.pod 11 Apr 2003 05:19:53 -0000 1.14
+++ docs/devel/porting/porting.pod 21 Aug 2003 14:19:05 -0000
@@ -29,14 +29,14 @@
#include ap_mmn.h
/* ... */
- #if AP_MODULE_MAGIC_AT_LEAST(20020329,1)
+ #if AP_MODULE_MAGIC_AT_LEAST(20020903,3)
/* 2.0 code */
#else
/* 1.0 code */
#endif
The C<20020329.1> is the value of the magic version number matching
-Apache 2.0.36, the earliest Apache version supported by mod_perl 2.0.
+Apache 2.0.46, the earliest Apache version supported by mod_perl 2.0.
=head1 Thread Safety
Index: src/modules/perl/modperl_apache_compat.c
===================================================================
RCS file: /home/cvspublic/modperl-2.0/src/modules/perl/modperl_apache_compat.c,v
retrieving revision 1.2
diff -u -r1.2 modperl_apache_compat.c
--- src/modules/perl/modperl_apache_compat.c 19 Aug 2003 19:30:33 -0000 1.2
+++ src/modules/perl/modperl_apache_compat.c 21 Aug 2003 14:19:05 -0000
@@ -2,25 +2,6 @@
/* back compat adjustements for older Apache versions */
-/* pre-APR_0_9_0 (APACHE_2_0_40) */
-#if APR_MAJOR_VERSION == 0 && APR_MINOR_VERSION == 9 && \
- APR_PATCH_VERSION == 0 && defined(APR_IS_DEV_VERSION)
-
-/* added in APACHE_2_0_40/APR_0_9_0 */
-apr_status_t apr_socket_timeout_get(apr_socket_t *sock, apr_interval_time_t *t)
-{
- modperl_apr_func_not_implemented(apr_sockettimeout_get, 2.0.40, 0.9.0);
- return APR_ENOTIMPL;
-}
-
-apr_status_t apr_socket_timeout_set(apr_socket_t *sock, apr_interval_time_t t)
-{
- modperl_apr_func_not_implemented(apr_socket_timeout_set, 2.0.40, 0.9.0);
- return APR_ENOTIMPL;
-}
-
-#endif /* pre-APR_0_9_0 (APACHE_2_0_40) */
-
/* pre-APR_0_9_5 (APACHE_2_0_47)
* both 2.0.46 and 2.0.47 shipped with 0.9.4 -
* we need the one that shipped with 2.0.47,
Index: src/modules/perl/modperl_apache_compat.h
===================================================================
RCS file: /home/cvspublic/modperl-2.0/src/modules/perl/modperl_apache_compat.h,v
retrieving revision 1.2
diff -u -r1.2 modperl_apache_compat.h
--- src/modules/perl/modperl_apache_compat.h 19 Aug 2003 19:30:33 -0000 1.2
+++ src/modules/perl/modperl_apache_compat.h 21 Aug 2003 14:19:05 -0000
@@ -9,31 +9,8 @@
#endif
/* XXX: these backcompat macros can be deleted when we bump up the
- * minimal supported httpd version to 2.0.40 or higher
+ * minimal supported httpd version to 2.0.47 or higher
*/
-#ifndef apr_time_sec
-#define apr_time_sec(time) ((apr_int64_t)((time) / APR_USEC_PER_SEC))
-#endif
-#ifndef apr_time_usec
-#define apr_time_usec(time) ((apr_int32_t)((time) % APR_USEC_PER_SEC))
-#endif
-#ifndef apr_time_from_sec
-#define apr_time_from_sec(sec) ((apr_time_t)(sec) * APR_USEC_PER_SEC)
-#endif
-
-/* pre-APR_0_9_0 (APACHE_2_0_40) */
-#if APR_MAJOR_VERSION == 0 && APR_MINOR_VERSION == 9 && \
- APR_PATCH_VERSION == 0 && defined(APR_IS_DEV_VERSION)
-
-/* deprecated since APR_0_9_0 */
-#define apr_socket_opt_get apr_getsocketopt
-#define apr_socket_opt_set apr_setsocketopt
-
-/* added in APACHE_2_0_40/APR_0_9_0 */
-apr_status_t apr_socket_timeout_get(apr_socket_t *sock, apr_interval_time_t *t);
-apr_status_t apr_socket_timeout_set(apr_socket_t *sock, apr_interval_time_t t);
-
-#endif /* pre-APR_0_9_0 (APACHE_2_0_40) */
/* pre-APR_0_9_5 (APACHE_2_0_47)
* both 2.0.46 and 2.0.47 shipped with 0.9.4 -
Index: src/modules/perl/modperl_apache_includes.h
===================================================================
RCS file: /home/cvspublic/modperl-2.0/src/modules/perl/modperl_apache_includes.h,v
retrieving revision 1.25
diff -u -r1.25 modperl_apache_includes.h
--- src/modules/perl/modperl_apache_includes.h 6 Aug 2003 06:46:35 -0000 1.25
+++ src/modules/perl/modperl_apache_includes.h 21 Aug 2003 14:19:05 -0000
@@ -20,24 +20,7 @@
#include "ap_mpm.h"
#include "apr_version.h"
-
-/* 2.0.36 is APR_0_9_0-dev */
-
-#if APR_MAJOR_VERSION == 0 && APR_MINOR_VERSION == 9 && APR_PATCH_VERSION < 3
-/* apr < 0.9.3 */
-#define APR_VERSION_0_9_3_MINUS
-#else
-/* apr >= 0.9.3 */
-#define APR_VERSION_0_9_3_PLUS
-#endif
-
-#ifndef APR_POLLIN
-/*
- * apr_poll.h introduced around 2.0.40
- * APR_POLL* constants moved here around 2.0.44
- */
#include "apr_poll.h"
-#endif
#include "apr_lib.h"
#include "apr_strings.h"
#include "apr_uri.h"
@@ -51,10 +34,5 @@
#include "util_filter.h"
#include "util_script.h"
-
-
-#ifdef APR_VERSION_0_9_3_PLUS
-#include "apr_env.h"
-#endif
#endif /* MODPERL_APACHE_INCLUDES_H */--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
