Skip to content

[pull] main from zaproxy:main #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Sep 8, 2026
Merged

[pull] main from zaproxy:main #199

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
564711a
Update Exclude from Spider resource messages
thc202 Sep 7, 2026
f017d9d
Merge pull request #9451 from thc202/session-modern
psiinon Sep 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions zap/src/main/resources/org/zaproxy/zap/resources/Messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2176,7 +2176,7 @@ options.globalexcludeurl.dialog.token.remove.title = Remove Global Exclude URL R
options.globalexcludeurl.dialog.token.warning.name.repeated.text = Another regex for this Global Exclude URL already exists.
options.globalexcludeurl.dialog.token.warning.name.repeated.title = Duplicated Global Exclude URL Regex
options.globalexcludeurl.label.tokens = <html><body><p>These regex URLs will be ignored by the Proxy, Scanner, and Spider when activated. See the help pages for more information.</p></body></html>
options.globalexcludeurl.seeglobalconfig = Note: URLs in Options / Global Exclude URL will also be ignored.
options.globalexcludeurl.seeglobalconfig = Note: URLs in the Options' Global Exclusions will also be ignored.
options.globalexcludeurl.table.header.description = Description
options.globalexcludeurl.table.header.enabled = Enabled
options.globalexcludeurl.table.header.token = Regex URL
Expand Down Expand Up @@ -2667,7 +2667,7 @@ session.scope.include.title = Include in Scope
session.select.session = Session:
session.select.title = Open Session
session.spider.exclude.title = Exclude from Spider
session.spider.label.ignore = URLs which will be ignored by the spiders (standard and AJAX)
session.spider.label.ignore = URLs which will be ignored by the spiders (standard and modern)
session.untitled = Untitled Session

sessionManagement.api.action.setSessionManagementMethod = Sets the session management method for the context with the given ID.
Expand Down
Loading