AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-11 16:28:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix #3769

Browse Source
This commit is contained in:
Adrian Siekierka 2025-04-06 13:25:30 +02:00
parent 7fecb0732c
commit d1599ab8b6
5 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.properties
View File

@ -1,7 +1,7 @@
minecraft.version=1.7.10 minecraft.version=1.7.10
forge.version=10.13.4.1614-1.7.10 forge.version=10.13.4.1614-1.7.10
oc.version=1.8.7-snapshot oc.version=1.8.8-snapshot
ae2.version=rv2-stable-10 ae2.version=rv2-stable-10
bc.version=7.1.24 bc.version=7.1.24

14
changelog.md
View File

@ -1,17 +1,7 @@
## Fixes/improvements ## Fixes/improvements
* [#3703] Fix potential packet memory leak. * [#3769] Add default user agent configuration option; change OpenComputers' default user agent to "opencomputers/$version".
* [#3729] Fix potential crash when opening the manual.
* Added a configuration option for network packet TTL. (Timothé GRISOT)
* Improved mod load times on certain platforms. (charagarland)
* Updated Chinese translation. (HfSr)
* Updated Unifont to 16.0.02.
## OpenOS fixes/improvements
* [#3714] Fix an OpenOS 1.8.0 regression causing event.pullFiltered() to effectively ignore filter timeouts.
* [#3727] Fix an exception handler bug in process.lua, uncovered by fixing recursive xpcall() handling in 1.8.4.
## List of contributors ## List of contributors
asie, charagarland, DragDen, HfSr, Timothé GRISOT asie

5
src/main/resources/application.conf
View File

@ -1001,6 +1001,11 @@ opencomputers {
"allow default" "allow default"
] ]
# The default user agent used by HTTP calls made by the internet card.
# The string "$version" will be replaced with the version of the copy of
# OpenComputers used.
httpUserAgent: "opencomputers/$version"
# The time in seconds to wait for a response to a request before timing # The time in seconds to wait for a response to a request before timing
# out and returning an error message. If this is zero (the default) the # out and returning an error message. If this is zero (the default) the
# request will never time out. # request will never time out.

3
src/main/scala/li/cil/oc/Settings.scala
View File

@ -500,6 +500,9 @@ class Settings(val config: Config) {
def internetAccessAllowed(): Boolean = { def internetAccessAllowed(): Boolean = {
internetAccessConfigured() && !internetFilteringRulesInvalid() internetAccessConfigured() && !internetFilteringRulesInvalid()
} }
// >= 1.8.8
val httpUserAgent = config.getString("internet.httpUserAgent")
} }
object Settings { object Settings {

1
src/main/scala/li/cil/oc/server/component/InternetCard.scala
View File

@ -515,6 +515,7 @@ object InternetCard {
http.setDoInput(true) http.setDoInput(true)
http.setDoOutput(post.isDefined) http.setDoOutput(post.isDefined)
http.setRequestMethod(if (method.isDefined) method.get else if (post.isDefined) "POST" else "GET") http.setRequestMethod(if (method.isDefined) method.get else if (post.isDefined) "POST" else "GET")
http.setRequestProperty("User-Agent", Settings.get.httpUserAgent.replace("$version", OpenComputers.Version))
headers.foreach(Function.tupled(http.setRequestProperty)) headers.foreach(Function.tupled(http.setRequestProperty))
if (post.isDefined) { if (post.isDefined) {
http.setReadTimeout(Settings.get.httpTimeout) http.setReadTimeout(Settings.get.httpTimeout)