extern/KasmVNC
1
0
Fork 0
mirror of https://github.com/kasmtech/KasmVNC.git synced 2024-11-24 17:14:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into KASM-1609_select_de_to_run

Browse Source
This commit is contained in:
Dmitry Maksyoma 2021-08-20 22:46:08 +12:00
commit 102d9b9a6c
10 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builder/dockerfile.centos_core.build
View File

@ -22,8 +22,7 @@ RUN cd /tmp/libwebp-1.0.2 && \
RUN useradd -m docker && echo "docker:docker" | chpasswd RUN useradd -m docker && echo "docker:docker" | chpasswd
COPY . /src COPY --chown=docker:docker . /src/
RUN chown -R docker:docker /src
USER docker USER docker
ENTRYPOINT ["/src/builder/build.sh"] ENTRYPOINT ["/src/builder/build.sh"]

3
builder/dockerfile.debian_bullseye.build
View File

@ -24,8 +24,7 @@ RUN cd /tmp/libwebp-1.0.2 && \
RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
COPY . /src COPY --chown=docker:docker . /src/
RUN chown -R docker:docker /src
USER docker USER docker
ENTRYPOINT ["/src/builder/build.sh"] ENTRYPOINT ["/src/builder/build.sh"]

3
builder/dockerfile.debian_buster.build
View File

@ -24,8 +24,7 @@ RUN cd /tmp/libwebp-1.0.2 && \
RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
COPY . /src COPY --chown=docker:docker . /src/
RUN chown -R docker:docker /src
USER docker USER docker
ENTRYPOINT ["/src/builder/build.sh"] ENTRYPOINT ["/src/builder/build.sh"]

3
builder/dockerfile.fedora_thirtythree.build
View File

@ -31,8 +31,7 @@ RUN cd /tmp/libwebp-1.0.2 && \
RUN useradd -m docker && echo "docker:docker" | chpasswd RUN useradd -m docker && echo "docker:docker" | chpasswd
COPY . /src COPY --chown=docker:docker . /src/
RUN chown -R docker:docker /src
USER docker USER docker
ENTRYPOINT ["/src/builder/build.sh"] ENTRYPOINT ["/src/builder/build.sh"]

3
builder/dockerfile.kali_kali-rolling.build
View File

@ -24,8 +24,7 @@ RUN cd /tmp/libwebp-1.0.2 && \
RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
COPY . /src COPY --chown=docker:docker . /src/
RUN chown -R docker:docker /src
USER docker USER docker
ENTRYPOINT ["/src/builder/build.sh"] ENTRYPOINT ["/src/builder/build.sh"]

3
builder/dockerfile.ubuntu1604.build
View File

@ -14,8 +14,7 @@ RUN cd /tmp/libwebp-1.0.2 && ./configure && make && make install
RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
COPY . /src COPY --chown=docker:docker . /src/
RUN chown -R docker:docker /src
USER docker USER docker

3
builder/dockerfile.ubuntu_bionic.build
View File

@ -28,8 +28,7 @@ RUN cd /tmp/libwebp-1.0.2 && \
RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
COPY . /src COPY --chown=docker:docker . /src/
RUN chown -R docker:docker /src
USER docker USER docker
ENTRYPOINT ["/src/builder/build.sh"] ENTRYPOINT ["/src/builder/build.sh"]

3
builder/dockerfile.ubuntu_focal.build
View File

@ -24,8 +24,7 @@ RUN cd /tmp/libwebp-1.0.2 && \
RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
COPY . /src COPY --chown=docker:docker . /src/
RUN chown -R docker:docker /src
USER docker USER docker
ENTRYPOINT ["/src/builder/build.sh"] ENTRYPOINT ["/src/builder/build.sh"]

2
common/network/websocket.c
View File

@ -583,7 +583,7 @@ int parse_handshake(ws_ctx_t *ws_ctx, char *handshake) {
headers->host[end-start] = '\0'; headers->host[end-start] = '\0';
headers->origin[0] = '\0'; headers->origin[0] = '\0';
start = strstr(handshake, "\r\nOrigin: "); start = strcasestr(handshake, "\r\nOrigin: ");
if (start) { if (start) {
start += 10; start += 10;
} else { } else {

5
common/rfb/VNCServerST.cxx
View File

@ -273,6 +273,11 @@ void VNCServerST::removeSocket(network::Socket* sock) {
std::list<VNCSConnectionST*>::iterator ci; std::list<VNCSConnectionST*>::iterator ci;
for (ci = clients.begin(); ci != clients.end(); ci++) { for (ci = clients.begin(); ci != clients.end(); ci++) {
if ((*ci)->getSock() == sock) { if ((*ci)->getSock() == sock) {
if (clipboardClient == *ci)
handleClipboardAnnounce(*ci, false);
clipboardRequestors.remove(*ci);
// - Delete the per-Socket resources // - Delete the per-Socket resources
delete *ci; delete *ci;