]> granicus.if.org Git - apache/log
apache
10 years agoPass the correct pointer that made it past the test suite.
Graham Leggett [Mon, 30 Dec 2013 10:56:05 +0000 (10:56 +0000)]
Pass the correct pointer that made it past the test suite.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1554184 13f79535-47bb-0310-9956-ffa450edef68

10 years agoPass the correct pointer that made it past the test suite.
Graham Leggett [Mon, 30 Dec 2013 10:52:58 +0000 (10:52 +0000)]
Pass the correct pointer that made it past the test suite.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1554181 13f79535-47bb-0310-9956-ffa450edef68

10 years agoAdded missing proxy export symbols.
Guenter Knauf [Mon, 30 Dec 2013 10:37:40 +0000 (10:37 +0000)]
Added missing proxy export symbols.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1554179 13f79535-47bb-0310-9956-ffa450edef68

10 years agoPass the correct pointer that made it past the test suite.
Graham Leggett [Mon, 30 Dec 2013 10:21:07 +0000 (10:21 +0000)]
Pass the correct pointer that made it past the test suite.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1554176 13f79535-47bb-0310-9956-ffa450edef68

10 years agomod_authnz_groupfile: Support the expression parser within the require directives.
Graham Leggett [Mon, 30 Dec 2013 09:59:58 +0000 (09:59 +0000)]
mod_authnz_groupfile: Support the expression parser within the require directives.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1554175 13f79535-47bb-0310-9956-ffa450edef68

10 years ago[trunl][doc] Introducing .fr translation for mod/mod_cgi.xml
Vincent Deffontaines [Mon, 30 Dec 2013 09:52:26 +0000 (09:52 +0000)]
[trunl][doc] Introducing .fr translation for mod/mod_cgi.xml

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1554172 13f79535-47bb-0310-9956-ffa450edef68

10 years agomod_authnz_dbm: Support the expression parser within the require directives.
Graham Leggett [Mon, 30 Dec 2013 09:37:17 +0000 (09:37 +0000)]
mod_authnz_dbm: Support the expression parser within the require directives.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1554170 13f79535-47bb-0310-9956-ffa450edef68

10 years agoUpdate transformation.
Graham Leggett [Mon, 30 Dec 2013 08:54:42 +0000 (08:54 +0000)]
Update transformation.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1554169 13f79535-47bb-0310-9956-ffa450edef68

10 years agomod_authnz_dbd: Support the expression parser within the require directives.
Graham Leggett [Mon, 30 Dec 2013 08:54:09 +0000 (08:54 +0000)]
mod_authnz_dbd: Support the expression parser within the require directives.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1554168 13f79535-47bb-0310-9956-ffa450edef68

10 years agoUpdate transformation.
Graham Leggett [Mon, 30 Dec 2013 07:49:33 +0000 (07:49 +0000)]
Update transformation.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1554162 13f79535-47bb-0310-9956-ffa450edef68

10 years agomod_authnz_ldap: Support the expression parser within the require
Graham Leggett [Mon, 30 Dec 2013 07:48:18 +0000 (07:48 +0000)]
mod_authnz_ldap: Support the expression parser within the require
directives.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1554161 13f79535-47bb-0310-9956-ffa450edef68

10 years agoupdate transformation
Kaspar Brand [Sat, 28 Dec 2013 13:28:05 +0000 (13:28 +0000)]
update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553825 13f79535-47bb-0310-9956-ffa450edef68

10 years agoRemove the hardcoded algorithm-type dependency for the SSLCertificateFile
Kaspar Brand [Sat, 28 Dec 2013 13:24:17 +0000 (13:24 +0000)]
Remove the hardcoded algorithm-type dependency for the SSLCertificateFile
and SSLCertificateKeyFile directives, and deprecate SSLCertificateChainFile

Splitting the patch into smaller pieces turned out to be infeasible,
unfortunately, due to the heavily intertwined code in ssl_engine_config.c,
ssl_engine_init.c and ssl_engine_pphrase.c, which all depends on the
modssl_pk_server_t data structure. For better comprehensibility,
a detailed listing of the changes follows:

ssl_private.h
- drop the X509 certs and EVP_PKEY keys arrays from modssl_pk_server_t
- use apr_array_header_t for cert_files and key_files
- drop tPublicCert from SSLModConfigRec
- drop the ssl_algo_t struct and the SSL_ALGO_* and SSL_AIDX_* constants

ssl_engine_config.c
- change to apr_array_header_t for SSLCertificate[Key]File
- drop ssl_cmd_check_aidx_max, i.e. allow an arbitrary number of certs
  and keys (in theory; currently OpenSSL does not support more than
  one cert/key per algorithm type)
- add deprecation warning for SSLCertificateChainFile

ssl_engine_init.c
- configure server certs/keys in ssl_init_server_certs (no longer via
  ssl_pphrase_Handle in ssl_init_Module)
- in ssl_init_server_certs, read in certificates and keys with standard
  OpenSSL API functions (SSL_CTX_use_*_file), and only fall back to
  ssl_load_encrypted_pkey when encountering an encrypted private key
- drop ssl_server_import_cert, ssl_server_import_key, ssl_init_server_check,
  and ssl_init_ctx_cleanup_server
- move the "problematic re-initialization" check to ssl_init_server_ctx

ssl_engine_pphrase.c
- use servername:port:index as the key identifier, instead of the
  previously used servername:port:algorithm
- ssl_pphrase_Handle overhaul: remove all cert/public-key handling,
  make it only load a single (encrypted) private key, and rename
  to ssl_load_encrypted_pkey
- in the passphrase prompt message, show the private key file name
  instead of the vhost id and the algorithm name
- do no longer supply the algorithm name as an argument to "exec"-type
  passphrase prompting programs

ssl_util.c
- drop ssl_util_algotypeof, ssl_util_algotypestr, ssl_asn1_keystr,
  and ssl_asn1_table_keyfmt

ssl_util_ssl.{c,h}
- drop SSL_read_X509
- constify the filename arg for SSL_read_PrivateKey

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553824 13f79535-47bb-0310-9956-ffa450edef68

10 years ago[trunk][doc] Introducing .fr translation for mod/mod_cgid.xml
Vincent Deffontaines [Fri, 27 Dec 2013 14:30:12 +0000 (14:30 +0000)]
[trunk][doc] Introducing .fr translation for mod/mod_cgid.xml

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553677 13f79535-47bb-0310-9956-ffa450edef68

10 years ago[trunk][doc] Introducing .fr translation for mod/mod_cern_meta.xml
Vincent Deffontaines [Fri, 27 Dec 2013 10:14:51 +0000 (10:14 +0000)]
[trunk][doc] Introducing .fr translation for mod/mod_cern_meta.xml

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553659 13f79535-47bb-0310-9956-ffa450edef68

10 years ago[trunk][doc] Introducing .fr translation for mod/mod_cache_socache.xml
Vincent Deffontaines [Fri, 27 Dec 2013 10:00:12 +0000 (10:00 +0000)]
[trunk][doc] Introducing .fr translation for mod/mod_cache_socache.xml

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553655 13f79535-47bb-0310-9956-ffa450edef68

10 years agorpm spec file: Ensure that apr-util-ldap is installed when mod_authnz_ldap
Graham Leggett [Thu, 26 Dec 2013 17:13:12 +0000 (17:13 +0000)]
rpm spec file: Ensure that apr-util-ldap is installed when mod_authnz_ldap
is installed.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553514 13f79535-47bb-0310-9956-ffa450edef68

10 years ago[trunk][doc] .fr translation for r1553502
Vincent Deffontaines [Thu, 26 Dec 2013 16:07:07 +0000 (16:07 +0000)]
[trunk][doc] .fr translation for r1553502

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553504 13f79535-47bb-0310-9956-ffa450edef68

10 years ago[trunk][doc] mod_dir.xml : Added missing details about DirectoryIndexRedirect
Vincent Deffontaines [Thu, 26 Dec 2013 15:54:32 +0000 (15:54 +0000)]
[trunk][doc] mod_dir.xml : Added missing details about DirectoryIndexRedirect

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553502 13f79535-47bb-0310-9956-ffa450edef68

10 years agoproperty fixes.
André Malo [Thu, 26 Dec 2013 15:20:45 +0000 (15:20 +0000)]
property fixes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553496 13f79535-47bb-0310-9956-ffa450edef68

10 years agoupdate transformation
André Malo [Thu, 26 Dec 2013 15:07:38 +0000 (15:07 +0000)]
update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553493 13f79535-47bb-0310-9956-ffa450edef68

10 years ago[trunk][doc] Introducing .fr translation for mod/mod_authz_groupfile.xml
Vincent Deffontaines [Thu, 26 Dec 2013 14:47:44 +0000 (14:47 +0000)]
[trunk][doc] Introducing .fr translation for mod/mod_authz_groupfile.xml

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553489 13f79535-47bb-0310-9956-ffa450edef68

10 years ago[trunk][doc] Introducing .fr translation for mod/mod_authz_dbm.xml
Vincent Deffontaines [Thu, 26 Dec 2013 14:37:57 +0000 (14:37 +0000)]
[trunk][doc] Introducing .fr translation for mod/mod_authz_dbm.xml

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553488 13f79535-47bb-0310-9956-ffa450edef68

10 years agoemphasize that these directives only apply to authn
Eric Covener [Thu, 26 Dec 2013 14:09:37 +0000 (14:09 +0000)]
emphasize that these directives only apply to authn

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553487 13f79535-47bb-0310-9956-ffa450edef68

10 years agoupdate comments for two r->user related directives.
Eric Covener [Thu, 26 Dec 2013 13:57:49 +0000 (13:57 +0000)]
update comments for two r->user related directives.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553485 13f79535-47bb-0310-9956-ffa450edef68

10 years ago[trunk][doc] mod/mod_authz_dbd.xml.fr - uptodate with r1553482
Vincent Deffontaines [Thu, 26 Dec 2013 13:44:50 +0000 (13:44 +0000)]
[trunk][doc] mod/mod_authz_dbd.xml.fr - uptodate with r1553482

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553483 13f79535-47bb-0310-9956-ffa450edef68

10 years ago[trunk][doc] mod/mod_authz_dbd.xml - Section title improvment
Vincent Deffontaines [Thu, 26 Dec 2013 13:39:32 +0000 (13:39 +0000)]
[trunk][doc] mod/mod_authz_dbd.xml - Section title improvment

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553482 13f79535-47bb-0310-9956-ffa450edef68

10 years ago[trunk][doc] One more <p> for better readability
Vincent Deffontaines [Thu, 26 Dec 2013 13:36:52 +0000 (13:36 +0000)]
[trunk][doc] One more <p> for better readability

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553481 13f79535-47bb-0310-9956-ffa450edef68

10 years ago[trunk][doc] Introducing .fr translation for mod/mod_authz_dbd.xml
Vincent Deffontaines [Thu, 26 Dec 2013 13:34:27 +0000 (13:34 +0000)]
[trunk][doc] Introducing .fr translation for mod/mod_authz_dbd.xml

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553479 13f79535-47bb-0310-9956-ffa450edef68

10 years ago[trunk][doc] Bringing .fr translation up to match r1553469
Vincent Deffontaines [Thu, 26 Dec 2013 11:41:25 +0000 (11:41 +0000)]
[trunk][doc] Bringing .fr translation up to match r1553469

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553470 13f79535-47bb-0310-9956-ffa450edef68

10 years ago[trunk][doc] mod/mod_authz_core : Re-ordering sections so the essential is stated...
Vincent Deffontaines [Thu, 26 Dec 2013 11:36:40 +0000 (11:36 +0000)]
[trunk][doc] mod/mod_authz_core : Re-ordering sections so the essential is stated first

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553469 13f79535-47bb-0310-9956-ffa450edef68

10 years ago[trunk][doc] Introducing .fr translation for mod/mod_authz_core.xml
Vincent Deffontaines [Thu, 26 Dec 2013 11:31:46 +0000 (11:31 +0000)]
[trunk][doc] Introducing .fr translation for mod/mod_authz_core.xml

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553468 13f79535-47bb-0310-9956-ffa450edef68

10 years ago[trunk][doc] Introducing .fr translation for mod/mod_authn_socache.xml
Vincent Deffontaines [Thu, 26 Dec 2013 09:26:59 +0000 (09:26 +0000)]
[trunk][doc] Introducing .fr translation for mod/mod_authn_socache.xml

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553463 13f79535-47bb-0310-9956-ffa450edef68

10 years ago[trunk][doc] Introducing .fr translation for mod/mod_authn_dbm.xml
Vincent Deffontaines [Wed, 25 Dec 2013 18:06:23 +0000 (18:06 +0000)]
[trunk][doc] Introducing .fr translation for mod/mod_authn_dbm.xml

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553405 13f79535-47bb-0310-9956-ffa450edef68

10 years ago[trunk][doc] Introducing .fr translation for mod/mod_authn_dbd.xml
Vincent Deffontaines [Wed, 25 Dec 2013 17:58:41 +0000 (17:58 +0000)]
[trunk][doc] Introducing .fr translation for mod/mod_authn_dbd.xml

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553402 13f79535-47bb-0310-9956-ffa450edef68

10 years ago[trunk][doc] Introducing .fr translation for mod/mod_authn_anon.xml
Vincent Deffontaines [Wed, 25 Dec 2013 17:44:43 +0000 (17:44 +0000)]
[trunk][doc] Introducing .fr translation for mod/mod_authn_anon.xml

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553401 13f79535-47bb-0310-9956-ffa450edef68

10 years ago[trunk][doc] Introducing french translation for mod/mod_allowmethods.xml
Vincent Deffontaines [Wed, 25 Dec 2013 17:36:11 +0000 (17:36 +0000)]
[trunk][doc] Introducing french translation for mod/mod_allowmethods.xml

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553400 13f79535-47bb-0310-9956-ffa450edef68

10 years ago[trunk][doc] Introducing french translatation for mod/directive-dict.xml
Vincent Deffontaines [Wed, 25 Dec 2013 17:28:17 +0000 (17:28 +0000)]
[trunk][doc] Introducing french translatation for mod/directive-dict.xml

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553399 13f79535-47bb-0310-9956-ffa450edef68

10 years ago[trunk][doc] Introducing .fr translation for mod/directives.xml
Vincent Deffontaines [Wed, 25 Dec 2013 17:14:32 +0000 (17:14 +0000)]
[trunk][doc] Introducing .fr translation for mod/directives.xml

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553398 13f79535-47bb-0310-9956-ffa450edef68

10 years ago* Do not perform SNI / Host header comparison in case of a forward proxy request as
Ruediger Pluem [Mon, 23 Dec 2013 20:47:59 +0000 (20:47 +0000)]
* Do not perform SNI / Host header comparison in case of a forward proxy request as
  in case of a forward proxy request the host header can not be used for virtual
  host selection in our webserver.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553204 13f79535-47bb-0310-9956-ffa450edef68

10 years agoJust in case the Makefile is incompatible, remove the
Jim Jagielski [Mon, 23 Dec 2013 17:58:42 +0000 (17:58 +0000)]
Just in case the Makefile is incompatible, remove the
fluff when we rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553165 13f79535-47bb-0310-9956-ffa450edef68

10 years agowe need to remove this fluff as well
Jim Jagielski [Mon, 23 Dec 2013 16:35:18 +0000 (16:35 +0000)]
we need to remove this fluff as well

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553146 13f79535-47bb-0310-9956-ffa450edef68

10 years agoAllow user to explicitly determine whether or not BSD syntax
Jim Jagielski [Mon, 23 Dec 2013 16:08:36 +0000 (16:08 +0000)]
Allow user to explicitly determine whether or not BSD syntax
makefiles should be created... The default is NO unless we
are on a *BSD* system, in which case we actually see if
'make' is gmake or not.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553134 13f79535-47bb-0310-9956-ffa450edef68

10 years agoOops... revert
Jim Jagielski [Fri, 20 Dec 2013 18:57:45 +0000 (18:57 +0000)]
Oops... revert

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1552783 13f79535-47bb-0310-9956-ffa450edef68

10 years agoFor *bsd* systems, see if we are using BSD make and,
Jim Jagielski [Fri, 20 Dec 2013 18:48:14 +0000 (18:48 +0000)]
For *bsd* systems, see if we are using BSD make and,
if so, then use that format for include/ifdef/else/endif

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1552779 13f79535-47bb-0310-9956-ffa450edef68

10 years agoRemove <Proxy ~ wildcard-url> syntax which:
Christophe Jaillet [Thu, 19 Dec 2013 04:53:15 +0000 (04:53 +0000)]
Remove <Proxy ~ wildcard-url> syntax which:
   - is equivalent to <ProxyMatch wildcard-url>
   - has never been documented
   - incorrectly checks parameters (!cmd->path should be !cmd->path[0])
   - is buggy (! is missing in front of strncasecmp)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1552227 13f79535-47bb-0310-9956-ffa450edef68

10 years agoThis is annoying to see in a casual "LogLevel debug foo:traceX ..."
Eric Covener [Wed, 18 Dec 2013 22:25:50 +0000 (22:25 +0000)]
This is annoying to see in a casual "LogLevel debug foo:traceX ..."

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1552130 13f79535-47bb-0310-9956-ffa450edef68

10 years agoget arpa/inet.h from apr_want.h for htons where applicable
Eric Covener [Wed, 18 Dec 2013 15:02:43 +0000 (15:02 +0000)]
get arpa/inet.h from apr_want.h for htons where applicable

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1551968 13f79535-47bb-0310-9956-ffa450edef68

10 years agoRemove useless \t and blank line that were not backported into 2.4.x in r1542557
Christophe Jaillet [Wed, 18 Dec 2013 05:36:22 +0000 (05:36 +0000)]
Remove useless \t and blank line that were not backported into 2.4.x in r1542557

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1551854 13f79535-47bb-0310-9956-ffa450edef68

10 years agochange r1500483 to only be enabled when building against the MS LDAP SDK.
Eric Covener [Wed, 18 Dec 2013 02:05:50 +0000 (02:05 +0000)]
change r1500483 to only be enabled when building against the MS LDAP SDK.

Guenter, please verify this still works for you.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1551802 13f79535-47bb-0310-9956-ffa450edef68

10 years agoAvoid sending back uninitialized memory, use 'ftpmessage' in order to have something...
Christophe Jaillet [Tue, 17 Dec 2013 21:18:04 +0000 (21:18 +0000)]
Avoid sending back uninitialized memory, use 'ftpmessage' in order to have something meaningful instead.

Save 8k of stack by the same time.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1551714 13f79535-47bb-0310-9956-ffa450edef68

10 years agoFreeBSD: Disable IPv4-mapped listening sockets by default for versions
Jeff Trawick [Tue, 17 Dec 2013 20:25:54 +0000 (20:25 +0000)]
FreeBSD: Disable IPv4-mapped listening sockets by default for versions
5+ instead of just for FreeBSD 5.

PR: 53824

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1551685 13f79535-47bb-0310-9956-ffa450edef68

10 years agoLog a warning when the LDAP authn provider is configured but an AuthLDAPURL
Eric Covener [Tue, 17 Dec 2013 16:38:36 +0000 (16:38 +0000)]
Log a warning when the LDAP authn provider is configured but an AuthLDAPURL
isn't -- IOW, avoid silently skipping a misconfigured [or buggy?] LDAP provider.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1551611 13f79535-47bb-0310-9956-ffa450edef68

10 years agoUse 'apr_pstrmemdup' instead of 'apr_pstrndup' when applicable
Christophe Jaillet [Sun, 15 Dec 2013 10:37:06 +0000 (10:37 +0000)]
Use 'apr_pstrmemdup' instead of 'apr_pstrndup' when applicable

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1551013 13f79535-47bb-0310-9956-ffa450edef68

10 years agoRemove redundant check (already performed the line before)
Christophe Jaillet [Sun, 15 Dec 2013 10:30:35 +0000 (10:30 +0000)]
Remove redundant check (already performed the line before)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1551012 13f79535-47bb-0310-9956-ffa450edef68

10 years ago'ap_getword_conf' can not return NULL
Christophe Jaillet [Sun, 15 Dec 2013 10:28:58 +0000 (10:28 +0000)]
'ap_getword_conf' can not return NULL

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1551011 13f79535-47bb-0310-9956-ffa450edef68

10 years ago'ap_getword_conf' can not return NULL
Christophe Jaillet [Sun, 15 Dec 2013 10:26:12 +0000 (10:26 +0000)]
'ap_getword_conf' can not return NULL

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1551010 13f79535-47bb-0310-9956-ffa450edef68

10 years agoEase logic around 'ap_getword_conf' and drop useless line of code.
Christophe Jaillet [Sun, 15 Dec 2013 10:23:07 +0000 (10:23 +0000)]
Ease logic around 'ap_getword_conf' and drop useless line of code.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1551009 13f79535-47bb-0310-9956-ffa450edef68

10 years ago'ap_getword_conf' does not return NULL but an empty string if nothing could be got.
Christophe Jaillet [Sun, 15 Dec 2013 07:53:09 +0000 (07:53 +0000)]
'ap_getword_conf' does not return NULL but an empty string if nothing could be got.
So the message 02173 can never trigger.

Actually, this is not a problem because all calls to 'ap_unixd_set_rlimit' are done in configuration parsing functions guarded with AP_INIT_TAKE12, so we are guaranteed to have something.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1551005 13f79535-47bb-0310-9956-ffa450edef68

10 years agoUpdate.
Lucien Gentis [Sat, 14 Dec 2013 12:41:18 +0000 (12:41 +0000)]
Update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1550931 13f79535-47bb-0310-9956-ffa450edef68

10 years agos/equivalant/equivalent/ in comments
Christophe Jaillet [Fri, 13 Dec 2013 19:56:41 +0000 (19:56 +0000)]
s/equivalant/equivalent/ in comments

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1550828 13f79535-47bb-0310-9956-ffa450edef68

10 years agos/password/pass/
Daniel Gruno [Fri, 13 Dec 2013 10:59:22 +0000 (10:59 +0000)]
s/password/pass/

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1550686 13f79535-47bb-0310-9956-ffa450edef68

10 years agoUse a better example for a connection string (one with both username and password)
Daniel Gruno [Fri, 13 Dec 2013 10:48:09 +0000 (10:48 +0000)]
Use a better example for a connection string (one with both username and password)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1550682 13f79535-47bb-0310-9956-ffa450edef68

10 years agoRemove redundant check
Christophe Jaillet [Fri, 13 Dec 2013 06:04:02 +0000 (06:04 +0000)]
Remove redundant check

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1550651 13f79535-47bb-0310-9956-ffa450edef68

10 years agos/ip/IP/ in comments
Christophe Jaillet [Fri, 13 Dec 2013 06:01:28 +0000 (06:01 +0000)]
s/ip/IP/ in comments

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1550650 13f79535-47bb-0310-9956-ffa450edef68

10 years agomod_session_crypto: Make sure we try to initialise twice, so we don't
Graham Leggett [Wed, 11 Dec 2013 23:14:46 +0000 (23:14 +0000)]
mod_session_crypto: Make sure we try to initialise twice, so we don't
succeed in configtest but fail on restart.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1550312 13f79535-47bb-0310-9956-ffa450edef68

10 years agomod_auth_form: Make the trace logging consistent through the notes, session
Graham Leggett [Wed, 11 Dec 2013 23:08:42 +0000 (23:08 +0000)]
mod_auth_form: Make the trace logging consistent through the notes, session
and form authentication steps.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1550307 13f79535-47bb-0310-9956-ffa450edef68

10 years agomod_auth_form: Add a debug message when the fields on a form are not
Graham Leggett [Wed, 11 Dec 2013 22:59:53 +0000 (22:59 +0000)]
mod_auth_form: Add a debug message when the fields on a form are not
recognised.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1550302 13f79535-47bb-0310-9956-ffa450edef68

10 years agoCleanup the bb brigade, because buckets inserted to it can be created from
Jan Kaluža [Wed, 11 Dec 2013 07:27:12 +0000 (07:27 +0000)]
Cleanup the bb brigade, because buckets inserted to it can be created from
scpool and this pool can be freed before this brigade.
POSSIBLE (but as yet unconfirmed) fix for crashes seen with threaded servers,
e.g. PR 50335.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1550061 13f79535-47bb-0310-9956-ffa450edef68

10 years agomod_ssl: Add -t -DDUMP_CA_CERTS option which dumps the filenames of all
Jan Kaluža [Wed, 11 Dec 2013 07:16:28 +0000 (07:16 +0000)]
mod_ssl: Add -t -DDUMP_CA_CERTS option which dumps the filenames of all
configured SSL CA certificates to stdout the same way as DUMP_CERTS does.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1550060 13f79535-47bb-0310-9956-ffa450edef68

10 years agoUse apr_pstrmemdup instead of apr_pstrndup when this is safe.
Christophe Jaillet [Mon, 9 Dec 2013 21:11:09 +0000 (21:11 +0000)]
Use apr_pstrmemdup instead of apr_pstrndup when this is safe.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1549680 13f79535-47bb-0310-9956-ffa450edef68

10 years agoUse apr_pstrmemdup instead of apr_pstrndup when this is safe.
Christophe Jaillet [Mon, 9 Dec 2013 20:52:26 +0000 (20:52 +0000)]
Use apr_pstrmemdup instead of apr_pstrndup when this is safe.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1549676 13f79535-47bb-0310-9956-ffa450edef68

10 years agoUpdate.
Lucien Gentis [Sat, 7 Dec 2013 14:48:08 +0000 (14:48 +0000)]
Update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1548918 13f79535-47bb-0310-9956-ffa450edef68

10 years agoOnly close hdrs.fd when returning non-OK from cache_select(),
Eric Covener [Wed, 4 Dec 2013 17:09:42 +0000 (17:09 +0000)]
Only close hdrs.fd when returning non-OK from cache_select(),
because it will be read from in the very next mod_cache callback
recall_headers().  Problem masked on unix by buffering.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1547845 13f79535-47bb-0310-9956-ffa450edef68

10 years agoFix module id in log messages issued from main.c
Jeff Trawick [Mon, 2 Dec 2013 15:42:34 +0000 (15:42 +0000)]
Fix module id in log messages issued from main.c

Submitted by: rjung

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1547065 13f79535-47bb-0310-9956-ffa450edef68

10 years agoFix missing spaces in messages
Christophe Jaillet [Sun, 1 Dec 2013 21:13:56 +0000 (21:13 +0000)]
Fix missing spaces in messages

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1546860 13f79535-47bb-0310-9956-ffa450edef68

10 years agoavoid duplication of APR_HOOK_LINK invocations
Jeff Trawick [Sun, 1 Dec 2013 18:51:04 +0000 (18:51 +0000)]
avoid duplication of APR_HOOK_LINK invocations

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1546836 13f79535-47bb-0310-9956-ffa450edef68

10 years agoFollow-up to r1546759: Fix compilation when exception hooks aren't enabled.
Jeff Trawick [Sun, 1 Dec 2013 18:46:56 +0000 (18:46 +0000)]
Follow-up to r1546759: Fix compilation when exception hooks aren't enabled.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1546835 13f79535-47bb-0310-9956-ffa450edef68

10 years agoSGC became dead in January 2000, effectively
Kaspar Brand [Sun, 1 Dec 2013 11:57:42 +0000 (11:57 +0000)]
SGC became dead in January 2000, effectively
(http://www.gpo.gov/fdsys/pkg/FR-2000-01-14/pdf/00-983.pdf)
Almost 14 years later, there's certainly no longer any need
to spit out some fancy log message.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1546805 13f79535-47bb-0310-9956-ffa450edef68

10 years agoThrow away the myCtxVar{Set,Get} abomination and introduce
Kaspar Brand [Sun, 1 Dec 2013 11:52:44 +0000 (11:52 +0000)]
Throw away the myCtxVar{Set,Get} abomination and introduce
a pphrase_cb_arg_t struct instead, for passing stuff between
ssl_pphrase_Handle and ssl_pphrase_Handle_CB. Prefer struct
members instead of using additional local variables, to make
the data flow more transparent. (Doesn't "vastly simplify"
the code yet, but hopefully we'll get there when further
stripping down ssl_pphrase_Handle.)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1546804 13f79535-47bb-0310-9956-ffa450edef68

10 years agoIf the "value" argument is prefixed with expr=, parse it with ap_expr
Eric Covener [Sun, 1 Dec 2013 11:23:22 +0000 (11:23 +0000)]
If the "value" argument is prefixed with expr=, parse it with ap_expr
rather than mod_headers' built-in format strings.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1546801 13f79535-47bb-0310-9956-ffa450edef68

10 years ago2.4.x CHANGES was updated in r1546547 to cover these entries
Jeff Trawick [Sun, 1 Dec 2013 00:41:01 +0000 (00:41 +0000)]
2.4.x CHANGES was updated in r1546547 to cover these entries

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1546774 13f79535-47bb-0310-9956-ffa450edef68

10 years agofollow-up to r1546759: remove an inadvertently committed testcase
Jeff Trawick [Sat, 30 Nov 2013 18:00:59 +0000 (18:00 +0000)]
follow-up to r1546759: remove an inadvertently committed testcase

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1546760 13f79535-47bb-0310-9956-ffa450edef68

10 years agoAdd suspend_connection and resume_connection hooks to notify modules
Jeff Trawick [Sat, 30 Nov 2013 17:56:25 +0000 (17:56 +0000)]
Add suspend_connection and resume_connection hooks to notify modules
when the thread/connection relationship changes.  (Currently implemented
only for the Event MPM; should be implemented for all async MPMs.)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1546759 13f79535-47bb-0310-9956-ffa450edef68

10 years agoUpdates.
Lucien Gentis [Sat, 30 Nov 2013 16:48:28 +0000 (16:48 +0000)]
Updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1546747 13f79535-47bb-0310-9956-ffa450edef68

10 years agofix whitespace in a debug message
Jeff Trawick [Sat, 30 Nov 2013 14:06:55 +0000 (14:06 +0000)]
fix whitespace in a debug message

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1546730 13f79535-47bb-0310-9956-ffa450edef68

10 years agoTweaks for SSLOpenSSLConfCmd:
Kaspar Brand [Sat, 30 Nov 2013 07:44:27 +0000 (07:44 +0000)]
Tweaks for SSLOpenSSLConfCmd:
- use cfgMergeArray, and reduce the size of the initial array
- move SSL_CONF_cmd calls from ssl_init_ctx_protocol to
  ssl_init_server_ctx (so they are applied after ssl_init_server_certs)
- add APLOG_DEBUG-level logging for the SSL_CONF_cmd success case
- call SSL_CONF_CTX_free(cctx) when done in ssl_init_server_ctx

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1546693 13f79535-47bb-0310-9956-ffa450edef68

10 years agoAxe dead code: It wouldn't have been needed ever since httpd 2.0.35
Kaspar Brand [Sat, 30 Nov 2013 07:17:53 +0000 (07:17 +0000)]
Axe dead code: It wouldn't have been needed ever since httpd 2.0.35
was released in April 2002... it was fixed in the [unreleased]
SSLeay 0.9.1b, which was the basis for the initial OpenSSL 0.9.1c
release in December 1998 (specifically, it's this change to ssl_set_pkey():
https://cvs.openssl.org/filediff?f=openssl/ssl/ssl_rsa.c&v1=1.1.1.2&v2=1.1.1.3)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1546692 13f79535-47bb-0310-9956-ffa450edef68

10 years agoRemove obsolete TODOs for mod_ssl:
Kaspar Brand [Sat, 30 Nov 2013 06:49:58 +0000 (06:49 +0000)]
Remove obsolete TODOs for mod_ssl:

No, we don't - it was removed in r90511.

DH keys are changed for every connection, SSL_OP_SINGLE_DH_USE
is applied since mod_ssl's initial commit (r88988).

We no longer have our own CRL callback (delegated to OpenSSL
as of r1165056), so this is effectively moot.

ssl_engine_pphrase.c needs to be simplified, not blown up further
(see also https://issues.apache.org/bugzilla/show_bug.cgi?id=24031,
which few [if any] people really seem to miss)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1546690 13f79535-47bb-0310-9956-ffa450edef68

10 years agoupdate transformations
Takashi Sato [Fri, 29 Nov 2013 14:43:30 +0000 (14:43 +0000)]
update transformations

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1546573 13f79535-47bb-0310-9956-ffa450edef68

10 years agofix XML validation error on r1543907
Takashi Sato [Fri, 29 Nov 2013 14:23:49 +0000 (14:23 +0000)]
fix XML validation error on r1543907

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1546568 13f79535-47bb-0310-9956-ffa450edef68

10 years agofix XML validation error on r1546534
Takashi Sato [Fri, 29 Nov 2013 14:21:34 +0000 (14:21 +0000)]
fix XML validation error on r1546534

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1546567 13f79535-47bb-0310-9956-ffa450edef68

10 years agocompat note for AuthLDAPBindPassword exec:
Eric Covener [Fri, 29 Nov 2013 10:55:49 +0000 (10:55 +0000)]
compat note for AuthLDAPBindPassword exec:

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1546534 13f79535-47bb-0310-9956-ffa450edef68

10 years agoList all APR dependencies
Gregg Lewis Smith [Thu, 28 Nov 2013 18:29:46 +0000 (18:29 +0000)]
List all APR dependencies
PR 54739

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1546438 13f79535-47bb-0310-9956-ffa450edef68

10 years agoFollow-up to r1538490:
Jeff Trawick [Tue, 26 Nov 2013 17:11:51 +0000 (17:11 +0000)]
Follow-up to r1538490:

Ensure that conn_rec->sbh is always cleared when returning from process_socket().

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1545736 13f79535-47bb-0310-9956-ffa450edef68

10 years agoFix error
Jim Jagielski [Mon, 25 Nov 2013 21:41:29 +0000 (21:41 +0000)]
Fix error

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1545415 13f79535-47bb-0310-9956-ffa450edef68

10 years agoConsistent types (2nd commit for future backport ease)
Jim Jagielski [Mon, 25 Nov 2013 21:24:20 +0000 (21:24 +0000)]
Consistent types (2nd commit for future backport ease)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1545412 13f79535-47bb-0310-9956-ffa450edef68

10 years agoConsistent types
Jim Jagielski [Mon, 25 Nov 2013 21:24:18 +0000 (21:24 +0000)]
Consistent types

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1545411 13f79535-47bb-0310-9956-ffa450edef68

10 years agonaming suggestion re: trawick
Jim Jagielski [Mon, 25 Nov 2013 21:10:05 +0000 (21:10 +0000)]
naming suggestion re: trawick

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1545408 13f79535-47bb-0310-9956-ffa450edef68

10 years agoUse offset which is smack dab in the middle.
Jim Jagielski [Mon, 25 Nov 2013 18:28:53 +0000 (18:28 +0000)]
Use offset which is smack dab in the middle.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1545364 13f79535-47bb-0310-9956-ffa450edef68