Build #31

Plan branch:

Build: #31 was successful Scheduled with changes by daryl herzmann and Guus der Kinderen

Code commits

Openfire (main)

  • daryl herzmann

    daryl herzmann 296c84f0c08fb553c7072224dd6b546ec164fc07

    march toward 4.9.1-SNAPSHOT

    • distribution/pom.xml (version 296c84f0c08fb553c7072224dd6b546ec164fc07)
    • i18n/pom.xml (version 296c84f0c08fb553c7072224dd6b546ec164fc07)
    • plugins/openfire-plugin-assembly-descriptor/pom.xml (version 296c84f0c08fb553c7072224dd6b546ec164fc07)
    • plugins/pom.xml (version 296c84f0c08fb553c7072224dd6b546ec164fc07)
    • pom.xml (version 296c84f0c08fb553c7072224dd6b546ec164fc07)
    • starter/pom.xml (version 296c84f0c08fb553c7072224dd6b546ec164fc07)
    • xmppserver/pom.xml (version 296c84f0c08fb553c7072224dd6b546ec164fc07)
    • xmppserver/src/main/java/org/jivesoftware/openfire/spi/XMPPServerInfoImpl.java (version 296c84f0c08fb553c7072224dd6b546ec164fc07)
  • daryl herzmann

    daryl herzmann c18abc6ebbc3484a134e4812e072475505838c06

    Merge pull request #2556 from igniterealtime/backport-2553-to-4.9
    [Backport 4.9] OF-2890: Fix CSRF error on admin setup (directory services)

  • Guus der Kinderen

    Guus der Kinderen 9485dd9e21462baaa4b6b48a8ad52e837fcbf655

    OF-2890: Fix CSRF error on admin setup (directory services)
    This fixes a bug that prevented the successful password-check of a newly configured admin.

    The page that performs the test is embedded as a dialog in another page. To prevent collisions with the 'csrf' parameter, the parameter on the embedded page is renamed to 'embeddedcsrf'. CSRF processing on the parent page is not performed if the page reload related to the embedded page (CSRF checking is performed there).

    (cherry picked from commit 7faedf031f6e9e04753cfbb242916e92e65db31f)

    • xmppserver/src/main/webapp/setup/setup-admin-settings.jsp (version 9485dd9e21462baaa4b6b48a8ad52e837fcbf655)
    • xmppserver/src/main/webapp/setup/setup-admin-settings_test.jsp (version 9485dd9e21462baaa4b6b48a8ad52e837fcbf655)
  • daryl herzmann

    daryl herzmann 0d349705506c7c0d7946526517f58efec50aa0a4

    Merge pull request #2555 from igniterealtime/backport-2554-to-4.9
    [Backport 4.9] OF-2891: Alignment on admin setup (directory services)

  • Guus der Kinderen

    Guus der Kinderen 61b5ede8cd53dbda3ef8aa91e38ac3074beea681

    OF-2891: Alignment on admin setup (directory services)
    A small HTML-fix for the page on which admin passwords are tested.

    (cherry picked from commit 6f8e8bdb0d23a21a711d5ba35f5bc8fdf5b337f4)

    • xmppserver/src/main/webapp/setup/setup-admin-settings.jsp (version 61b5ede8cd53dbda3ef8aa91e38ac3074beea681)