Author: jorton
Date: Fri Nov 16 10:52:40 2012
New Revision: 1410298
URL: http://svn.apache.org/viewvc?rev=1410298&view=rev
Log:
* src/modules/perl/modperl_apache_compat.h: Add mp_add_loaded_module
wrapper function.
* src/modules/perl/modperl_module.c (modperl_module_add): Use it.
Obtained from: branches/httpd24
Submitted by: torsten
Modified:
perl/modperl/trunk/src/modules/perl/modperl_apache_compat.h
perl/modperl/trunk/src/modules/perl/modperl_module.c
perl/modperl/trunk/xs/tables/current/Apache2/ConstantsTable.pm
Modified: perl/modperl/trunk/src/modules/perl/modperl_apache_compat.h
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_apache_compat.h?rev=1410298&r1=1410297&r2=1410298&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_apache_compat.h (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_apache_compat.h Fri Nov 16
10:52:40 2012
@@ -74,6 +74,10 @@ AP_DECLARE(const char *) ap_get_server_v
OPT_ALL | \
OPT_SYM_OWNER | \
OPT_MULTI)
+#define mp_add_loaded_module(modp, pool, name) \
+ ap_add_loaded_module((modp), (pool), (name))
+
+
#else
/* 2.2 API */
#define MP_HTTPD_OVERRIDE_OPTS_DEFAULT (OPT_UNSET | \
@@ -81,6 +85,10 @@ AP_DECLARE(const char *) ap_get_server_v
OPT_INCNOEXEC | \
OPT_SYM_OWNER | \
OPT_MULTI)
+#define mp_add_loaded_module(modp, pool, name) \
+ ap_add_loaded_module((modp), (pool))
+
+
#endif
#ifndef PROXYREQ_RESPONSE
Modified: perl/modperl/trunk/src/modules/perl/modperl_module.c
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_module.c?rev=1410298&r1=1410297&r2=1410298&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_module.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_module.c Fri Nov 16 10:52:40
2012
@@ -832,7 +832,7 @@ const char *modperl_module_add(apr_pool_
modperl_module_insert(modp);
- ap_add_loaded_module(modp, p);
+ mp_add_loaded_module(modp, p, modp->name);
apr_pool_cleanup_register(p, modp, modperl_module_remove,
apr_pool_cleanup_null);
Modified: perl/modperl/trunk/xs/tables/current/Apache2/ConstantsTable.pm
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/xs/tables/current/Apache2/ConstantsTable.pm?rev=1410298&r1=1410297&r2=1410298&view=diff
==============================================================================
--- perl/modperl/trunk/xs/tables/current/Apache2/ConstantsTable.pm (original)
+++ perl/modperl/trunk/xs/tables/current/Apache2/ConstantsTable.pm Fri Nov 16
10:52:40 2012
@@ -2,7 +2,7 @@ package Apache2::ConstantsTable;
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# ! WARNING: generated by Apache2::ParseSource/0.02
-# ! Mon May 23 14:15:32 2005
+# ! Tue Jun 12 09:42:50 2012
# ! do NOT edit, any changes will be lost !
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -30,7 +30,8 @@ $Apache2::ConstantsTable = {
'platform' => [
'LF',
'CR',
- 'CRLF'
+ 'CRLF',
+ 'CRLF_ASCII'
],
'override' => [
'OR_NONE',
@@ -55,7 +56,8 @@ $Apache2::ConstantsTable = {
'OPT_INCNOEXEC',
'OPT_SYM_OWNER',
'OPT_MULTI',
- 'OPT_ALL'
+ 'OPT_ALL',
+ 'OPT_INC_WITH_EXEC'
],
'mpmq' => [
'AP_MPMQ_NOT_SUPPORTED',
@@ -76,7 +78,8 @@ $Apache2::ConstantsTable = {
'AP_MPMQ_MAX_SPARE_THREADS',
'AP_MPMQ_MAX_REQUESTS_DAEMON',
'AP_MPMQ_MAX_DAEMONS',
- 'AP_MPMQ_MPM_STATE'
+ 'AP_MPMQ_MPM_STATE',
+ 'AP_MPMQ_IS_ASYNC'
],
'methods' => [
'M_GET',
@@ -226,98 +229,11 @@ $Apache2::ConstantsTable = {
'TAKE3',
'TAKE23',
'TAKE123',
- 'TAKE13'
- ],
- 'proxy' => [
- 'PROXYREQ_REVERSE',
- 'PROXYREQ_NONE',
- 'PROXYREQ_PROXY',
- 'PROXYREQ_RESPONSE',
- ],
+ 'TAKE13',
+ 'TAKE_ARGV'
+ ]
},
'APR::Const' => {
- 'uri' => [
- 'APR_URI_FTP_DEFAULT_PORT',
- 'APR_URI_SSH_DEFAULT_PORT',
- 'APR_URI_TELNET_DEFAULT_PORT',
- 'APR_URI_GOPHER_DEFAULT_PORT',
- 'APR_URI_HTTP_DEFAULT_PORT',
- 'APR_URI_POP_DEFAULT_PORT',
- 'APR_URI_NNTP_DEFAULT_PORT',
- 'APR_URI_IMAP_DEFAULT_PORT',
- 'APR_URI_PROSPERO_DEFAULT_PORT',
- 'APR_URI_WAIS_DEFAULT_PORT',
- 'APR_URI_LDAP_DEFAULT_PORT',
- 'APR_URI_HTTPS_DEFAULT_PORT',
- 'APR_URI_RTSP_DEFAULT_PORT',
- 'APR_URI_SNEWS_DEFAULT_PORT',
- 'APR_URI_ACAP_DEFAULT_PORT',
- 'APR_URI_NFS_DEFAULT_PORT',
- 'APR_URI_TIP_DEFAULT_PORT',
- 'APR_URI_SIP_DEFAULT_PORT',
- 'APR_URI_UNP_OMITSITEPART',
- 'APR_URI_UNP_OMITUSER',
- 'APR_URI_UNP_OMITPASSWORD',
- 'APR_URI_UNP_OMITUSERINFO',
- 'APR_URI_UNP_REVEALPASSWORD',
- 'APR_URI_UNP_OMITPATHINFO',
- 'APR_URI_UNP_OMITQUERY'
- ],
- 'table' => [
- 'APR_OVERLAP_TABLES_SET',
- 'APR_OVERLAP_TABLES_MERGE'
- ],
- 'status' => [
- 'APR_TIMEUP'
- ],
- 'socket' => [
- 'APR_SO_LINGER',
- 'APR_SO_KEEPALIVE',
- 'APR_SO_DEBUG',
- 'APR_SO_NONBLOCK',
- 'APR_SO_REUSEADDR',
- 'APR_SO_SNDBUF',
- 'APR_SO_RCVBUF',
- 'APR_SO_DISCONNECTED'
- ],
- 'shutdown_how' => [
- 'APR_SHUTDOWN_READ',
- 'APR_SHUTDOWN_WRITE',
- 'APR_SHUTDOWN_READWRITE'
- ],
- 'read_type' => [
- 'APR_BLOCK_READ',
- 'APR_NONBLOCK_READ'
- ],
- 'poll' => [
- 'APR_POLLIN',
- 'APR_POLLPRI',
- 'APR_POLLOUT',
- 'APR_POLLERR',
- 'APR_POLLHUP',
- 'APR_POLLNVAL'
- ],
- 'lockmech' => [
- 'APR_LOCK_FCNTL',
- 'APR_LOCK_FLOCK',
- 'APR_LOCK_SYSVSEM',
- 'APR_LOCK_PROC_PTHREAD',
- 'APR_LOCK_POSIXSEM',
- 'APR_LOCK_DEFAULT'
- ],
- 'limit' => [
- 'APR_LIMIT_CPU',
- 'APR_LIMIT_MEM',
- 'APR_LIMIT_NPROC',
- 'APR_LIMIT_NOFILE'
- ],
- 'hook' => [
- 'APR_HOOK_REALLY_FIRST',
- 'APR_HOOK_FIRST',
- 'APR_HOOK_MIDDLE',
- 'APR_HOOK_LAST',
- 'APR_HOOK_REALLY_LAST'
- ],
'fprot' => [
'APR_FPROT_USETID',
'APR_FPROT_UREAD',
@@ -349,37 +265,6 @@ $Apache2::ConstantsTable = {
'APR_FOPEN_SENDFILE_ENABLED',
'APR_FOPEN_LARGEFILE'
],
- 'flock' => [
- 'APR_FLOCK_SHARED',
- 'APR_FLOCK_EXCLUSIVE',
- 'APR_FLOCK_TYPEMASK',
- 'APR_FLOCK_NONBLOCK'
- ],
- 'finfo' => [
- 'APR_FINFO_LINK',
- 'APR_FINFO_MTIME',
- 'APR_FINFO_CTIME',
- 'APR_FINFO_ATIME',
- 'APR_FINFO_SIZE',
- 'APR_FINFO_CSIZE',
- 'APR_FINFO_DEV',
- 'APR_FINFO_INODE',
- 'APR_FINFO_NLINK',
- 'APR_FINFO_TYPE',
- 'APR_FINFO_USER',
- 'APR_FINFO_GROUP',
- 'APR_FINFO_UPROT',
- 'APR_FINFO_GPROT',
- 'APR_FINFO_WPROT',
- 'APR_FINFO_ICASE',
- 'APR_FINFO_NAME',
- 'APR_FINFO_MIN',
- 'APR_FINFO_IDENT',
- 'APR_FINFO_OWNER',
- 'APR_FINFO_PROT',
- 'APR_FINFO_NORM',
- 'APR_FINFO_DIRENT'
- ],
'filetype' => [
'APR_FILETYPE_NOFILE',
'APR_FILETYPE_REG',
@@ -390,82 +275,7 @@ $Apache2::ConstantsTable = {
'APR_FILETYPE_LNK',
'APR_FILETYPE_SOCK',
'APR_FILETYPE_UNKFILE'
- ],
- 'filepath' => [
- 'APR_FILEPATH_NOTABOVEROOT',
- 'APR_FILEPATH_SECUREROOTTEST',
- 'APR_FILEPATH_SECUREROOT',
- 'APR_FILEPATH_NOTRELATIVE',
- 'APR_FILEPATH_NOTABSOLUTE',
- 'APR_FILEPATH_NATIVE',
- 'APR_FILEPATH_TRUENAME',
- 'APR_FILEPATH_ENCODING_UNKNOWN',
- 'APR_FILEPATH_ENCODING_LOCALE',
- 'APR_FILEPATH_ENCODING_UTF8'
- ],
- 'error' => [
- 'APR_ENOSTAT',
- 'APR_ENOPOOL',
- 'APR_EBADDATE',
- 'APR_EINVALSOCK',
- 'APR_ENOPROC',
- 'APR_ENOTIME',
- 'APR_ENODIR',
- 'APR_ENOLOCK',
- 'APR_ENOPOLL',
- 'APR_ENOSOCKET',
- 'APR_ENOTHREAD',
- 'APR_ENOTHDKEY',
- 'APR_EGENERAL',
- 'APR_ENOSHMAVAIL',
- 'APR_EBADIP',
- 'APR_EBADMASK',
- 'APR_EDSOOPEN',
- 'APR_EABSOLUTE',
- 'APR_ERELATIVE',
- 'APR_EINCOMPLETE',
- 'APR_EABOVEROOT',
- 'APR_EBADPATH',
- 'APR_EPATHWILD',
- 'APR_ESYMNOTFOUND',
- 'APR_EPROC_UNKNOWN',
- 'APR_EOF',
- 'APR_EINIT',
- 'APR_ENOTIMPL',
- 'APR_EMISMATCH',
- 'APR_EBUSY',
- 'APR_EACCES',
- 'APR_EEXIST',
- 'APR_ENAMETOOLONG',
- 'APR_ENOENT',
- 'APR_ENOTDIR',
- 'APR_ENOSPC',
- 'APR_ENOMEM',
- 'APR_EMFILE',
- 'APR_ENFILE',
- 'APR_EBADF',
- 'APR_EINVAL',
- 'APR_ESPIPE',
- 'APR_EAGAIN',
- 'APR_EINTR',
- 'APR_ENOTSOCK',
- 'APR_ECONNREFUSED',
- 'APR_EINPROGRESS',
- 'APR_ECONNABORTED',
- 'APR_ECONNRESET',
- 'APR_ETIMEDOUT',
- 'APR_EHOSTUNREACH',
- 'APR_ENETUNREACH',
- 'APR_EFTYPE',
- 'APR_EPIPE',
- 'APR_EXDEV',
- 'APR_ENOTEMPTY',
- 'APR_EXCL',
- 'APR_END'
- ],
- 'common' => [
- 'APR_SUCCESS'
- ],
+ ]
}
};
