granicus.if.org Git - apache/log

]> granicus.if.org Git - apache/log

projects / apache / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Jim Jagielski [Mon, 10 Mar 2014 11:52:26 +0000 (11:52 +0000)]

Merge r1423933 from trunk:

On NetWare skip these unsupported function prototypes.

Submitted by: fuankg
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1575914 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Mon, 10 Mar 2014 11:51:50 +0000 (11:51 +0000)]

promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1575913 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Mon, 10 Mar 2014 11:51:31 +0000 (11:51 +0000)]

just in case

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1575912 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jeff Trawick [Mon, 10 Mar 2014 11:47:29 +0000 (11:47 +0000)]

niche-platform-specific build fix: does it even need a vote?

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1575911 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Mon, 10 Mar 2014 11:23:47 +0000 (11:23 +0000)]

Merge r1575400 from trunk:

CVE-2014-0098 (reported by Rainer Canavan <rainer-apache 7val com>)
Segfaults w/ truncated cookie logging.

Clean up the cookie logging parser to recognize only the cookie=value pairs,
not valueless cookies. This refactors multiple passes over the same string
buffer into a single pass parser.

Submitted by: wrowe
Reviewed by: rpluem, jim

Submitted by: wrowe
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1575904 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Yann Ylavic [Mon, 10 Mar 2014 11:15:33 +0000 (11:15 +0000)]

Vote and promote r1575400.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1575900 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Mon, 10 Mar 2014 10:54:02 +0000 (10:54 +0000)]

ivote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1575898 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Guenter Knauf [Mon, 10 Mar 2014 01:29:43 +0000 (01:29 +0000)]

Added proposal.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1575790 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Guenter Knauf [Mon, 10 Mar 2014 00:57:32 +0000 (00:57 +0000)]

Fixed mod_lua NetWare build.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1575784 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Guenter Knauf [Mon, 10 Mar 2014 00:48:47 +0000 (00:48 +0000)]

Added missing proxy export symbols.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1575783 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Eric Covener [Sun, 9 Mar 2014 21:31:42 +0000 (21:31 +0000)]

xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1575775 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Eric Covener [Sun, 9 Mar 2014 21:30:55 +0000 (21:30 +0000)]

copy/paste errors in new directive DirectoryCheckHandler

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1575774 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

André Malo [Sat, 8 Mar 2014 22:56:14 +0000 (22:56 +0000)]

update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1575629 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Lucien Gentis [Sat, 8 Mar 2014 17:39:43 +0000 (17:39 +0000)]

Updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1575579 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Rich Bowen [Fri, 7 Mar 2014 21:08:02 +0000 (21:08 +0000)]

Rebuild HTML

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1575409 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Rich Bowen [Fri, 7 Mar 2014 21:07:22 +0000 (21:07 +0000)]

As per comment, removing quotes makes the example work

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1575408 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

William A. Rowe Jr [Fri, 7 Mar 2014 21:02:18 +0000 (21:02 +0000)]

With enough eyeballs, all bugs are shallow. One more for your consideration.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1575404 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

William A. Rowe Jr [Thu, 6 Mar 2014 06:01:30 +0000 (06:01 +0000)]

No... I mean, really, really?

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1574777 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Wed, 5 Mar 2014 15:03:01 +0000 (15:03 +0000)]

backport proposal

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1574519 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Wed, 5 Mar 2014 13:31:20 +0000 (13:31 +0000)]

Merge r1562472, r1561262, r1561923, r1574151 from trunk:

More debugging

More debug messaging... useful for tracking down
if we used attach or create

c89 fix

follow-up to r1562472, 1561262, and 1561923:

Improve messaging...

* easier to tell what went wrong in some cases
* reduce number of debug messages without losing information in some cases

Submitted by: jim, covener, trawick
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1574476 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Wed, 5 Mar 2014 13:30:00 +0000 (13:30 +0000)]

promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1574474 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Wed, 5 Mar 2014 13:29:37 +0000 (13:29 +0000)]

vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1574472 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jeff Trawick [Wed, 5 Mar 2014 00:06:58 +0000 (00:06 +0000)]

s/whine/vote/

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1574264 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Yann Ylavic [Tue, 4 Mar 2014 21:35:00 +0000 (21:35 +0000)]

Vote for r1574151 to be included in mod_slotmem_shm logs' changeset

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1574217 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jeff Trawick [Tue, 4 Mar 2014 17:47:41 +0000 (17:47 +0000)]

cloudy in southeastern New Mexico for some reason

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1574155 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

André Malo [Mon, 3 Mar 2014 21:34:27 +0000 (21:34 +0000)]

update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1573760 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Yann Ylavic [Mon, 3 Mar 2014 15:41:43 +0000 (15:41 +0000)]

Set mod_slotmem_shm patches in correct order to be applyable.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1573588 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Yann Ylavic [Mon, 3 Mar 2014 15:25:59 +0000 (15:25 +0000)]

Vote for mod_slotmem_shm without ftok().

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1573583 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Eric Covener [Mon, 3 Mar 2014 15:02:45 +0000 (15:02 +0000)]

Backport r1557639 r1557640 from trunk

restore http://svn.apache.org/viewvc?view=revision&revision=233369
under a configurable option: don't run mod_dir if r->handler is already set.

Backported by: covner
Reviewed By: jim, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1573580 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Yann Ylavic [Mon, 3 Mar 2014 15:02:00 +0000 (15:02 +0000)]

Vote for mod_slotmem_shm debugging logs.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1573578 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Yann Ylavic [Mon, 3 Mar 2014 14:54:14 +0000 (14:54 +0000)]

Promote DirectoryCheckHandler.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1573575 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Yann Ylavic [Mon, 3 Mar 2014 14:51:04 +0000 (14:51 +0000)]

Vote for DirectoryCheckHandler.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1573574 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Sun, 2 Mar 2014 20:21:23 +0000 (20:21 +0000)]

Merge r1553204, r1555240, r1572198 from trunk:

* 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.

* Update comment. No functional change.

* Put a note in CHANGES about r1553204
Submitted by: rpluem
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1573362 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Sun, 2 Mar 2014 20:20:14 +0000 (20:20 +0000)]

Merge r1546804, r1553824, r1554192, r1555463, r1555467, r1563417, r1564760, r1565081 from trunk:

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.)

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

CodeWarrior compiler doesnt allow vars as struct inits.

Remove per-certificate chain handling code (obsoleted by
https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff;h=b9fa413a08d436d6b522749b5e808fcd931fd943)

make the ppcb_arg initialization a bit more uniform and easier to read

Followup fix for r1553824:

also pass the file name to ssl_load_encrypted_pkey, to make sure that we
retry with the same filename we used for SSL_CTX_use_PrivateKey_file first

With OpenSSL 1.0.2 or later, enable OCSP stapling in a loop based on
SSL_CTX_set_current_cert(), near the end of ssl_init_server_ctx.

update APLOGNO for r1564760
Submitted by: kbrand, fuankg, kbrand, kbrand, kbrand, kbrand, kbrand
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1573360 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Sun, 2 Mar 2014 20:18:03 +0000 (20:18 +0000)]

Merge r1572543 from trunk:

Cleanup the client to backend brigade before returning an error (if any) to avoid buckets lifetime issues (backend connection's pool destroyed before request's one). PR 50335.
Suggested by rpluem.

Submitted by: ylavic
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1573359 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

André Malo [Sun, 2 Mar 2014 20:17:40 +0000 (20:17 +0000)]

update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1573358 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Sun, 2 Mar 2014 20:17:14 +0000 (20:17 +0000)]

Merge r1568404 from trunk:

mod_proxy_http: don't recycle backend connections known to be closed (eg. EOS by close).
This saves a useless ap_is_socket_connected() call when reused.

Submitted by: ylavic
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1573357 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Sun, 2 Mar 2014 20:16:52 +0000 (20:16 +0000)]

Merge r1570598 from trunk:

Log an error in mod_proxy_http when reading the request body fails.
Follow-up to r1538776 where incomplete bodies are detected and an error returned through the input filters.

Submitted by: ylavic
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1573356 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Ruediger Pluem [Sun, 2 Mar 2014 20:05:59 +0000 (20:05 +0000)]

* Promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1573353 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Stephen Henson [Sun, 2 Mar 2014 18:23:36 +0000 (18:23 +0000)]

Vote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1573335 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Kaspar Brand [Sun, 2 Mar 2014 14:33:26 +0000 (14:33 +0000)]

vote for 'skip SNI check for forward proxy requests' proposal

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1573314 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Nilgun Belma Buguner [Sun, 2 Mar 2014 14:06:21 +0000 (14:06 +0000)]

update transformations.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1573310 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Nilgun Belma Buguner [Sun, 2 Mar 2014 14:05:36 +0000 (14:05 +0000)]

update for sync with English docs.

Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>
Reviewed by: Orhan Berent <berent belgeler.gen.tr>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1573309 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Nilgun Belma Buguner [Sun, 2 Mar 2014 12:20:53 +0000 (12:20 +0000)]

update transformations.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1573293 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Nilgun Belma Buguner [Sun, 2 Mar 2014 12:20:04 +0000 (12:20 +0000)]

update for sync with English docs.

Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>
Reviewed by: Orhan Berent <berent belgeler.gen.tr>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1573292 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Yann Ylavic [Sat, 1 Mar 2014 21:44:15 +0000 (21:44 +0000)]

Add commit (w/o functional change) to mod_proxy's SNI reuse check backport proposal.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1573230 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Yann Ylavic [Sat, 1 Mar 2014 21:07:36 +0000 (21:07 +0000)]

Remove all in one patch link about mod_deflate's backport bundle.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1573228 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Yann Ylavic [Sat, 1 Mar 2014 20:47:24 +0000 (20:47 +0000)]

Add a new commit (w/o functional change) on mod_deflate's backport bundle.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1573225 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Lucien Gentis [Sat, 1 Mar 2014 14:00:56 +0000 (14:00 +0000)]

Update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1573176 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Ruediger Pluem [Fri, 28 Feb 2014 20:48:19 +0000 (20:48 +0000)]

* Vote and promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1573073 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Yann Ylavic [Fri, 28 Feb 2014 14:52:03 +0000 (14:52 +0000)]

Add a new commit (fix) on the SNI reusability proposal.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1572968 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Yann Ylavic [Fri, 28 Feb 2014 12:51:27 +0000 (12:51 +0000)]

Propose and vote r1572092 from jkaluza and comment about independency of mod_deflate's patches.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1572939 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Yann Ylavic [Fri, 28 Feb 2014 11:52:55 +0000 (11:52 +0000)]

Propose mod_deflate's r1572655, r1572896 and al to backport.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1572927 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Mike Rumph [Fri, 28 Feb 2014 02:08:49 +0000 (02:08 +0000)]

Vote for mod_proxy_http fix

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1572805 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Mike Rumph [Thu, 27 Feb 2014 16:56:49 +0000 (16:56 +0000)]

Vote for mod_proxy_http fix

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1572657 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Yann Ylavic [Thu, 27 Feb 2014 15:44:26 +0000 (15:44 +0000)]

Propose r1572630 to backport.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1572634 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Thu, 27 Feb 2014 13:39:23 +0000 (13:39 +0000)]

votes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1572560 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Yann Ylavic [Thu, 27 Feb 2014 13:19:01 +0000 (13:19 +0000)]

Propose r1572543 to backport.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1572551 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Yann Ylavic [Thu, 27 Feb 2014 10:22:26 +0000 (10:22 +0000)]

Move draft-ietf-httpbis-p1-messaging-23 fixes to proposed backport (was being worked) like in 2.2.x, with my +1 vote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1572499 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

André Malo [Wed, 26 Feb 2014 21:27:36 +0000 (21:27 +0000)]

update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1572264 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Ruediger Pluem [Wed, 26 Feb 2014 19:25:38 +0000 (19:25 +0000)]

* Add proposal

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1572211 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Yann Ylavic [Tue, 25 Feb 2014 13:08:11 +0000 (13:08 +0000)]

Vote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1571675 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Christophe Jaillet [Tue, 25 Feb 2014 06:24:57 +0000 (06:24 +0000)]

Typo in comment (was r1571368)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1571578 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Eric Covener [Mon, 24 Feb 2014 22:43:44 +0000 (22:43 +0000)]

xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1571477 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Eric Covener [Mon, 24 Feb 2014 22:38:15 +0000 (22:38 +0000)]

fix setifempty compat info

http://httpd.apache.org/docs/2.4/mod/mod_headers.html#comment_2245

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1571473 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

André Malo [Sat, 22 Feb 2014 18:02:35 +0000 (18:02 +0000)]

stabilize sort for latex build as well

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1570868 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

André Malo [Sat, 22 Feb 2014 17:57:32 +0000 (17:57 +0000)]

update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1570866 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

André Malo [Sat, 22 Feb 2014 17:47:54 +0000 (17:47 +0000)]

handle duplicate directives by sorting directive lists additionally by module name

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1570864 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Lucien Gentis [Sat, 22 Feb 2014 15:29:59 +0000 (15:29 +0000)]

Updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1570851 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Rich Bowen [Sat, 22 Feb 2014 00:17:36 +0000 (00:17 +0000)]

Rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1570757 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

André Malo [Fri, 21 Feb 2014 20:01:32 +0000 (20:01 +0000)]

update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1570687 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Fri, 21 Feb 2014 19:47:26 +0000 (19:47 +0000)]

Merge r1570288 from trunk:

  *) mod_rewrite: Add RewriteOptions InheritDown, InheritDownBefore,
     and IgnoreInherit to allow RewriteRules to be pushed from parent scopes
     to child scopes without explicitly configuring each child scope.
     PR56153.

Submitted By: Edward Lu
Committed By: covener

Submitted by: covener
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1570684 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Fri, 21 Feb 2014 18:46:03 +0000 (18:46 +0000)]

ipromote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1570657 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Fri, 21 Feb 2014 18:45:46 +0000 (18:45 +0000)]

ivote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1570656 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Yann Ylavic [Fri, 21 Feb 2014 15:25:57 +0000 (15:25 +0000)]

Propose mod_proxy_http easy fixes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1570606 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Daniel Gruno [Fri, 21 Feb 2014 11:13:53 +0000 (11:13 +0000)]

Backport r1570528

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1570530 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Thu, 20 Feb 2014 19:38:49 +0000 (19:38 +0000)]

Merge r1542379 from trunk:

PR: 54852. Only use a dummy_connection for idle processes
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1570327 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Thu, 20 Feb 2014 19:37:27 +0000 (19:37 +0000)]

backported

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1570325 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Thu, 20 Feb 2014 19:37:09 +0000 (19:37 +0000)]

   * core: Detect incomplete body in HTTP input filter and return
              APR_INCOMPLETE. PR 55475.
     trunk patch: http://svn.apache.org/r1538776
          2.4.x patch: https://people.apache.org/~ylavic/2.4.x-http_filter_incomplete.patch

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1570324 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Thu, 20 Feb 2014 19:36:12 +0000 (19:36 +0000)]

Merge r1551685 from trunk:

FreeBSD: Disable IPv4-mapped listening sockets by default for versions
5+ instead of just for FreeBSD 5.

PR: 53824

Submitted by: trawick
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1570322 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Thu, 20 Feb 2014 19:35:39 +0000 (19:35 +0000)]

Merge r1569615 from trunk:

handle POLLERR/POLLHUP during poll() to avoid high CPU busy loop.

Submitted By: Joffroy Christen <joffroy.christen solvaxis com>, Eric Covener]
Committed By: covener

Submitted by: covener
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1570321 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Daniel Gruno [Thu, 20 Feb 2014 18:17:48 +0000 (18:17 +0000)]

some votes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1570293 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Eric Covener [Thu, 20 Feb 2014 18:10:33 +0000 (18:10 +0000)]

propose mod_rewrite enhancement

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1570291 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

André Malo [Thu, 20 Feb 2014 15:05:42 +0000 (15:05 +0000)]

update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1570215 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Thu, 20 Feb 2014 12:32:22 +0000 (12:32 +0000)]

backported

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1570168 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Daniel Gruno [Thu, 20 Feb 2014 12:10:32 +0000 (12:10 +0000)]

xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1570164 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Daniel Gruno [Thu, 20 Feb 2014 11:54:27 +0000 (11:54 +0000)]

mod_lua: Backport setcookie changes. PR 56128

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1570162 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Wed, 19 Feb 2014 12:43:58 +0000 (12:43 +0000)]

Merge r1487528, r1563379, r1563381, r1565711 from trunk:

* server/protocol.c (r_flush): Use int return type as per declaration
of apr_vformatter(); no functional change.

Use %pm in order to save 8k of stack in 'ap_pcfg_strerror'

s/apr_pstrndup/apr_pstrmemdup/ when applicable

follow-up to r1096569:

remove unnecessary total_modules calculation

Submitted by: jorton, jailletc36, jailletc36, trawick
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1569726 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Wed, 19 Feb 2014 12:42:22 +0000 (12:42 +0000)]

ipromote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1569724 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Wed, 19 Feb 2014 12:41:58 +0000 (12:41 +0000)]

ivote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1569723 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Eric Covener [Wed, 19 Feb 2014 02:53:16 +0000 (02:53 +0000)]

vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1569621 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Eric Covener [Wed, 19 Feb 2014 02:47:28 +0000 (02:47 +0000)]

propose wstunnel fix

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1569617 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Rich Bowen [Tue, 18 Feb 2014 18:27:56 +0000 (18:27 +0000)]

Rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1569464 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Rich Bowen [Tue, 18 Feb 2014 18:15:11 +0000 (18:15 +0000)]

Flipped links, L and END flags

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1569457 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Rich Bowen [Tue, 18 Feb 2014 16:44:09 +0000 (16:44 +0000)]

Alpha-ordering

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1569419 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Rich Bowen [Tue, 18 Feb 2014 16:21:43 +0000 (16:21 +0000)]

Insert missing space.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1569409 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Mon, 17 Feb 2014 21:29:15 +0000 (21:29 +0000)]

Merge r1542562 from trunk:

We were not being consistent between http and others
if we added the default port or not during the canonizing
phase... Baseline the http method (don't add unless the
port provided isn't the default).
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1569114 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Mike Rumph [Mon, 17 Feb 2014 20:42:15 +0000 (20:42 +0000)]

Vote for mod_proxy fix.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1569108 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Yann Ylavic [Mon, 17 Feb 2014 18:06:42 +0000 (18:06 +0000)]

New proposal about incomplete request/response bodies detection.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1569064 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Mon, 17 Feb 2014 14:17:38 +0000 (14:17 +0000)]

Backported

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1569009 13f79535-47bb-0310-9956-ffa450edef68

Unnamed repository; edit this file 'description' to name the repository.