Skip to content
This repository was archived by the owner on Jun 11, 2024. It is now read-only.

Commit 5a26559

Browse files
authored
Merge pull request #41 from browserup/pre-release-cleanup
Initial Pre-Release Cleanup
2 parents fca2968 + 05e8796 commit 5a26559

File tree

25 files changed

+325
-243
lines changed

25 files changed

+325
-243
lines changed

.idea/compiler.xml

Lines changed: 0 additions & 23 deletions
This file was deleted.

.idea/encodings.xml

Lines changed: 0 additions & 4 deletions
This file was deleted.

.idea/misc.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.idea/vcs.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.project

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>browserup-proxy</name>
4+
<comment>Project browserup-proxy created by Buildship.</comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
16+
</natures>
17+
</projectDescription>

CHANGELOG.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Changelog
2+
3+
# Upcoming
4+
5+
Performance, Page, and Network Assertions against the HAR.
6+
7+
# [1.0.0]
8+
- Initial fork based on BrowserMob Proxy
9+
- HTTP/2 support via Netty 4.1.34 upgrade
10+
- Java 11 support
11+
- Upgrades to dependencies (mockito, etc)
12+
- Upgrade to an actively maintained, [LittleProxy](https://github.com/mrog/LittleProxy) fork
13+
- Switch to Gradle
14+
- Import a new, better HAR reader from https://github.com/sdstoehr/har-reader
15+
- Extend the har reader with filtering/finding capabilities
16+
- Modify every existing file by adding a header to ensure compliance with Apache License
17+
- Rename our fork to our own name, BrowserUp, as we will be investing in it heavily.
18+
We have no relation to BrowserMob, which was a company acquired by Neustar in 2010.
19+
- Updates to the Readme to remove legacy proxyserver information

README.md

Lines changed: 36 additions & 93 deletions
Large diffs are not rendered by default.

browserup-proxy-core/.classpath

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" output="bin/main" path="src/main/java">
4+
<attributes>
5+
<attribute name="gradle_scope" value="main"/>
6+
<attribute name="gradle_used_by_scope" value="main,test"/>
7+
</attributes>
8+
</classpathentry>
9+
<classpathentry kind="src" output="bin/main" path="src/main/resources">
10+
<attributes>
11+
<attribute name="gradle_scope" value="main"/>
12+
<attribute name="gradle_used_by_scope" value="main,test"/>
13+
</attributes>
14+
</classpathentry>
15+
<classpathentry kind="src" output="bin/test" path="src/test/java">
16+
<attributes>
17+
<attribute name="gradle_scope" value="test"/>
18+
<attribute name="gradle_used_by_scope" value="test"/>
19+
</attributes>
20+
</classpathentry>
21+
<classpathentry kind="src" output="bin/test" path="src/test/groovy">
22+
<attributes>
23+
<attribute name="gradle_scope" value="test"/>
24+
<attribute name="gradle_used_by_scope" value="test"/>
25+
</attributes>
26+
</classpathentry>
27+
<classpathentry kind="src" output="bin/test" path="src/test/resources">
28+
<attributes>
29+
<attribute name="gradle_scope" value="test"/>
30+
<attribute name="gradle_used_by_scope" value="test"/>
31+
</attributes>
32+
</classpathentry>
33+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
34+
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
35+
<classpathentry kind="output" path="bin/default"/>
36+
</classpath>

browserup-proxy-core/.project

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>browserup-proxy-core</name>
4+
<comment>Project browserup-proxy-core created by Buildship.</comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
</buildSpec>
19+
<natures>
20+
<nature>org.eclipse.jdt.core.javanature</nature>
21+
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
22+
</natures>
23+
</projectDescription>

browserup-proxy-core/src/main/java/com/browserup/bup/filters/HarCaptureFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -784,7 +784,7 @@ public void serverToProxyResponseReceived() {
784784
long responseReceivedNanos = System.nanoTime();
785785

786786
// like the wait time, the receive time requires that the serverToProxyResponseReceiving() method be called before this method is invoked.
787-
// typically that should happen, but it has been reported (https://github.com/lightbody/BrowserUp-proxy/issues/288) that it
787+
// typically that should happen, but it has been reported (https://github.com/lightbody/BrowserMob-proxy/issues/288) that it
788788
// sometimes does not. therefore, to be safe, make sure responseReceiveStartedNanos is populated before setting the receive time.
789789
if (responseReceiveStartedNanos > 0L) {
790790
this.harEntry.getTimings().setReceive(responseReceivedNanos - responseReceiveStartedNanos, NANOSECONDS);

0 commit comments

Comments
 (0)