Skip to content
This repository was archived by the owner on Feb 6, 2025. It is now read-only.

Commit 36c4363

Browse files
committed
Merge remote branch 'upstreamrepo/main'
2 parents ee52ac6 + 14d611b commit 36c4363

File tree

5 files changed

+44
-3
lines changed

5 files changed

+44
-3
lines changed

docs/acap-sdk-version-3/develop-applications/vapix-access-for-acap-applications.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,10 @@ An ACAP application can acquire VAPIX service account credentials through a D-Bu
106106

107107
After obtaining the credentials, it's ready to make the actual VAPIX call. The ACAP application communicates with a local server, which then checks the given credentials (using basic access authentication) and forwards the VAPIX request.
108108
109+
> - **NOTE** If the device has set global device proxy, reaching the local virtual host (127.0.0.12)
110+
> is only possible if 127.0.0.12 is added to the `No proxy` list, as described in
111+
> [Configure-global-device-proxy](./global-device-proxy#configure-global-device-proxy).
112+
109113
1. Define a VAPIX endpoint:
110114
111115
VAPIX calls are essentially HTTP requests and require a URL.

docs/api/native-sdk-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ The Jansson API was introduced in Native SDK 1.14.
541541

542542
## Curl
543543

544-
Open-source library for transferring data with URLs. See [curl documentation](https://curl.se/docs/).
544+
Open-source library for transferring data with URLs. See [curl documentation](https://curl.se/docs/). For proxy configuration see [Global device proxy](../develop/global-device-proxy).
545545

546546
### Compatibility
547547

docs/develop/VAPIX-access-for-ACAP-applications.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,10 @@ An ACAP application can acquire VAPIX service account credentials through a D-Bu
9999

100100
After obtaining the credentials, it's ready to make the actual VAPIX call. The ACAP application communicates with a local server, which then checks the given credentials (using basic access authentication) and forwards the VAPIX request.
101101
102+
> - **NOTE** If the device has set global device proxy, reaching the local virtual host (127.0.0.12)
103+
> is only possible if 127.0.0.12 is added to the `No proxy` list, as described in
104+
> [Configure-global-device-proxy](./global-device-proxy#configure-global-device-proxy).
105+
102106
1. Define a VAPIX endpoint:
103107
104108
VAPIX calls are essentially HTTP requests and require a URL.
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
layout: page
3+
parent: Develop ACAP applications
4+
title: Global device proxy
5+
nav_order: 10
6+
---
7+
8+
# Global device proxy
9+
10+
Global device proxy settings act as global environment variables on the Axis device. There are three
11+
types of global device proxies that can be configured; `HTTP_PROXY`, `HTTPS_PROXY`, and `NO_PROXY`.
12+
13+
## Configure global device proxy
14+
15+
Global device proxy can be set via either:
16+
17+
- The VAPIX
18+
[Network Settings API](https://developer.axis.com/vapix/network-video/network-settings-api#setglobalproxyconfiguration-1).
19+
- The network page at `http://<AXIS_DEVICE_IP>/index.html#system/network` and section
20+
`Global proxies`.
21+
22+
## How are ACAP applications affected?
23+
24+
ACAP applications can be affected by global device proxy if they use the curl API or in any other
25+
way are able to pick up proxy from environment variables.

docs/develop/manifest-schemas/index.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,16 @@ a sub-section means it's only required if the section above is chosen.
2020

2121
Mapping table for manifest schema, AXIS OS and ACAP Native SDK version.
2222

23-
> It's recommended to use the latest manifest version available for the minimum
24-
> AXIS OS version targeted.
23+
> It's recommended to use the latest manifest schema version available in the
24+
> SDK. When [signing an ACAP
25+
> application](../../service/acap-application-signing), the ACAP Portal will
26+
> validate the manifest against the latest released manifest schema version
27+
> within the same major version, which may contain bug fixes to the version
28+
> included in the SDK.
29+
30+
> Note: To sign an ACAP application the minimum manifest schema version
31+
> possible to use is 1.3 that introduced the for signing mandatory field
32+
> `architecture`.
2533
2634
| Schema | AXIS OS | SDK | Description |
2735
| :----- | :------ | :-- | :---------- |

0 commit comments

Comments
 (0)