Skip to content
This repository was archived by the owner on May 14, 2020. It is now read-only.

Conversation

@spartantri
Copy link
Contributor

Added a few missing java classes
944120 |getproperty|filewriter|xmldecoder
944220 |getproperty|filewriter|xmldecoder
944240 |getproperty|filewriter|xmldecoder

java-classes.data:
+java.io.FilePermission
+java.io.FileWriter
+java.beans.XMLDecoder

@lifeforms
Copy link
Contributor

Needs rebasing, but the Java additions are OKd by @franbuehler @lifeforms.
Quick merge after the conflicts are fixed.

@lifeforms lifeforms added this to the CRS v3.2.0 milestone Dec 3, 2018
# OWASP ModSecurity Core Rule Set ver.3.2.0
# Copyright (c) 2006-2017 Trustwave and contributors. All rights reserved.
#
# The OWASP ModSecurity Core Rule Set is distributed under
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The 3 changes above here should be done separately.

@lifeforms
Copy link
Contributor

Hi @spartantri I'd like to merge this contribution, the core of your changes is fine, but this PR has some conflicts probably due to unimportant files... What do you think? Would you prefer to clean this up, start a new PR, or have somebody else make the PR?

@spartantri
Copy link
Contributor Author

Let me fix the conflicts to push this one

Replaced with origin
Replaced with Origin
@spartantri
Copy link
Contributor Author

@lifeforms there are failing checks in travis not related to this change, there are no conflicts, some of the changes to 944 where already merged as part of other PR I guess so I simply replace mine with the current version

@fgsch
Copy link
Contributor

fgsch commented Jan 7, 2019

Can you just rebase the core of the changes against v3.2/dev?

@lifeforms
Copy link
Contributor

Since the Git history for this PR is now messy due to changes in base, @spartantri will make a new PR and we will close this one.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants