httpd

Checkout Tools
  • last updated 5 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 1816442 is being indexed.

Vote mod_md

On the 2.4.x branch:

Updated STATUS proposal for mod_md backporting. New branch for changes available.

new patch for complete mod_md + mod_ssl changes
    • ?
    /httpd/patches/2.4.x/mod_md_ssl_complete.diff
generated file, do not version control
Set of changes to bring mod_md into the 2.4.x branch.

    • ?
    /httpd/branches/2.4.x-mod_md/modules/md/mod_md_os.h
    • ?
    /httpd/branches/2.4.x-mod_md/modules/md/Makefile
    • ?
    /httpd/branches/2.4.x-mod_md/modules/md/md_store.c
    • ?
    /httpd/branches/2.4.x-mod_md/modules/md/md_crypt.h
    • ?
    /httpd/branches/2.4.x-mod_md/modules/ssl/ssl_private.h
    • ?
    /httpd/branches/2.4.x-mod_md/modules/md/md_core.c
    • ?
    /httpd/branches/2.4.x-mod_md/modules/md/md_util.c
    • ?
    /httpd/branches/2.4.x-mod_md/modules/md/md_version.h
    • ?
    /httpd/branches/2.4.x-mod_md/modules/md/mod_md.c
    • ?
    /httpd/branches/2.4.x-mod_md/modules/md/md_acme_acct.h
    • ?
    /httpd/branches/2.4.x-mod_md/modules/md/md_http.c
  1. … 30 more files in changeset.
rewrite.t: add tests for 2.4.30 after r1815100
docs: allow Directive and <Directive> names to co-exist in the same page.

This work was done in trunk to allow the new mod_md's directive

names <ManagedDomain> and ManagedDomain in the same doc page (without

triggering any validate-xml/xhtml error). Subsequently this also helped

for SSLPolicy and <SSLPolicy>. All the aforementioned Directives

have not been backported yet, but these commits are needed behorehand to

allow a smoother backport procedure.

I explicitly reverted the changes to sections.xml for this backport since

they mention the above directives, not yet available in 2.4.x and hence

probably confusing for users.

Building the documentation after these changes yield to a no-op as expected.

I also tried to copy mod_md's documentation from trunk and it renders nicely.

Merge r1805189, r1805193, r1805372, r1805376, r1805189, r1806443 from trunk:

synopsis.xsl: do not render two times the same

directive HTML if more than one

directive share the same name.

This has happened when mod_md.xml was introduced,

and the following directives shared the same name:

* ManagedDomain

* <ManagedDomain>

With the current code each time that a node needs

to be rendered it will emit a duplicate, ending up

in the above example with 4 sections rather than two.

Uniqueness of sections will be ensured by the HTML

elements ids, to avoid errors before committing for

example (accidental duplicates, etc..).

common|synopsis.xsl: rename directive type=sections id generation

This commits is a follow up of r1805189 and it is meant

to allow directives with the same name but different type

to coexist in the same document without triggering errors

while executing validate-xhtml.

For example: mod_md.xml recently introduced the following:

* ManagedDomain

* <ManagedDomain> (this one is type=section)

In my opinion this is a perfectly valid use case and it should

be allowed/handled correctly by the doc generation process/validation.

In order to avoid clashing the directive ids will get a suffix

called "section" if type=section will be present as param.

Quicklinks, <directive> links have been updated to the new

scheme to avoid dandling pointers in the doc.

Comments/reviews are welcome, if I left something behind

please let me know.

doc xsl/dtd: introduce idtype attribute for directivesynopsis

In r1805193 synopsis.xsl was changed to allow two directives

of different type (like <SSLPolicy> and SSLPolicy) to share

the same name but have different ids (and please validate-xml/xhtml).

The downside of this action was that all the quicklinks to

existing directive sections (like <If>, <VirtualHost>, etc..)

were changed, possibly breaking external clients already

referencing them.

This change introduces a new attribute in the directivesynopsis

DTD, namely 'idtype', that will be appended to 'name'

in the id generation by synopsis.xsl. This will rollback

link names to their previous values and will allow documentators

to fine tune directivesynopsis sections as they need

(for example we have recently introduced mod_md's

ManagedDomain/<ManagedDomain>, and modssl's SSLPolicy/<SSLPolicy>).

This approach seems more precise and less invasive to me.

Of course the name of the attribute can be changed later on

to whatever term would fit best, the main concern for me at

the moment is to restore the trunk documentation to its previous

state.

common.dtd: add idtype attribute to directive

This change completes r1805372 and also fixes

links generation for <ManageDomain> and <SSLPolicy>

in sections.xml

synopsis.xsl: do not render two times the same

directive HTML if more than one

directive share the same name.

This has happened when mod_md.xml was introduced,

and the following directives shared the same name:

* ManagedDomain

* <ManagedDomain>

With the current code each time that a node needs

to be rendered it will emit a duplicate, ending up

in the above example with 4 sections rather than two.

Uniqueness of sections will be ensured by the HTML

elements ids, to avoid errors before committing for

example (accidental duplicates, etc..).

synopsis.xsl: fix broken translation builds

This commit is a follow up of r1805189, in which

a new logic was added to allow to repeat a directive

name only if its type is different (like SSLPolicy

and <SSLPolicy>). The change broken french translations

since the $this variable, containing the translated

sections, was not used anymore.

The XPath code could surely be improved, but it seems

more pressing to allow our translators to get back

to their daily work without interference.

build.sh validate-* worked fine, as well as the build.sh fr

translation.

Documentation rebuild - part 2
Documentation rebuild
Sync with trunk the override suggestions for directives in:

mod_authn_socache.xml

mod_logio.xml

mod_ssl.xml

This caused two issues:

1) ./build.sh validate-xhtml failing due to xml validation

failures for the string "Not applicable".

2) weird categories ('none', 'Not applicable', 'None') in

overrides.html that don't make much sense.

Fix broken link reported in PR 61799

and break long line.

Rebuild.

XML update.

Rebuild.

XML update.

rebuild
s/simmilar/similar/ reported in PR 61799

Fix layout of <highlight> to synch with trunk

rebuild
s/simmilar/similar/ reported in PR 61799

Remove some trailing spaces to synch with 2.4.x

Vote mod_md and aligned entry

mod_substitute: add runtime traces. PR 61132.

+1 on mod_ssl part & out of time.

On the 2.4.x branch:

proposals for backporting mod_md and related, necessary mod_ssl changes.

patches for mod_md bakcport proposal
    • ?
    /httpd/patches/2.4.x/mod_ssl_minimal_md.diff
    • ?
    /httpd/patches/2.4.x/mod_md-r1816156_svn.diff
On the trunk:

removed a2md from Windows makefile and .dsw

On the trunk:

mod_md: v1.0.4, removed the 'a2md' utility command from build. Only used in github

testing. Avoid problems with our build system that had problems after the latest

changes to make a clean initial build. Remove the windows a2md.dsp therefore also.

    • ?
    /httpd/trunk/modules/md/md_cmd_reg.h
    • ?
    /httpd/trunk/modules/md/md_cmd_store.h
    • ?
    /httpd/trunk/modules/md/md_cmd_acme.h
Regenerate.
Document special cases where changing Listen across a restart will

fail.

PR: 61666

Safemode was removed a long time ago - remove from test suite
    • ?
    /test/framework/trunk/t/php/safemode.t
spelling fixes from Josh Soref via github