Skip to content
GitLab
  1. 13 Dec, 2017 1 commit
  3. 12 Dec, 2017 2 commits
  5. 11 Dec, 2017 1 commit
  7. 05 Dec, 2017 2 commits
  9. 03 Dec, 2017 1 commit
  11. 02 Dec, 2017 5 commits
  13. 29 Nov, 2017 5 commits
  15. 27 Nov, 2017 2 commits
  17. 26 Nov, 2017 4 commits
    • Luca Toscano's avatar
      docs: allow Directive and <Directive> names to co-exist in the same page. · 92e3fc3f
      Luca Toscano authored 
      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.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1816378 13f79535-47bb-0310-9956-ffa450edef68
      92e3fc3f
    • Luca Toscano's avatar
      Documentation rebuild - part 2 · ce22f9a8
      Luca Toscano authored 
      git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1816375 13f79535-47bb-0310-9956-ffa450edef68
      ce22f9a8
    • Luca Toscano's avatar
      Documentation rebuild · 1dd61cfa
      Luca Toscano authored 
      git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1816357 13f79535-47bb-0310-9956-ffa450edef68
      1dd61cfa
    • Luca Toscano's avatar
      Sync with trunk the override suggestions for directives in: · d8c74ccc
      Luca Toscano authored 
      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.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1816356 13f79535-47bb-0310-9956-ffa450edef68
      d8c74ccc
  19. 25 Nov, 2017 4 commits
  21. 24 Nov, 2017 1 commit
  23. 23 Nov, 2017 2 commits
  25. 18 Nov, 2017 2 commits
  27. 16 Nov, 2017 1 commit
  29. 13 Nov, 2017 5 commits
  31. 09 Nov, 2017 1 commit
  33. 07 Nov, 2017 1 commit
    • Stefan Eissing's avatar
      On the 2.4.x branch: · acc35ca6
      Stefan Eissing authored 
      Merged /httpd/httpd/trunk:r1811649,1811664,1814118

  *) ab: Make the TLS layer aware that the underlying socket is nonblocking,
     and use/handle POLLOUT where needed to avoid busy IOs and recover write
     errors when appropriate.  [Yann Ylavic]

  *) ab: Keep reading nonblocking to exhaust TCP or SSL buffers when previous
     read was incomplete (the SSL case can cause the next poll() to timeout
     since data are buffered already).  PR 61301 [Luca Toscano, Yann Ylavic]




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