White space formatting fixes
Closes: <https://github.com/nginx/unit/pull/1062>
This commit is contained in:
@@ -3,7 +3,7 @@ case "$NXT_CC_NAME" in
|
|||||||
|
|
||||||
SunC):
|
SunC):
|
||||||
nxt_gen_dep_flags() {
|
nxt_gen_dep_flags() {
|
||||||
$echo "-xMMD -xMF $NXT_BUILD_DIR/$nxt_dep.tmp"
|
$echo "-xMMD -xMF $NXT_BUILD_DIR/$nxt_dep.tmp"
|
||||||
}
|
}
|
||||||
|
|
||||||
nxt_gen_dep_post() {
|
nxt_gen_dep_post() {
|
||||||
@@ -15,7 +15,7 @@ case "$NXT_CC_NAME" in
|
|||||||
|
|
||||||
*)
|
*)
|
||||||
nxt_gen_dep_flags() {
|
nxt_gen_dep_flags() {
|
||||||
$echo "-MMD -MF $NXT_BUILD_DIR/$nxt_dep -MT $NXT_BUILD_DIR/$nxt_obj"
|
$echo "-MMD -MF $NXT_BUILD_DIR/$nxt_dep -MT $NXT_BUILD_DIR/$nxt_obj"
|
||||||
}
|
}
|
||||||
|
|
||||||
nxt_gen_dep_post() {
|
nxt_gen_dep_post() {
|
||||||
|
|||||||
@@ -254,7 +254,7 @@ rpmbuild/SPECS/unit-%.spec: unit.module.spec.in ../../docs/changes.xml | rpmbuil
|
|||||||
cat ../../build/unit-$(MODULE_SUFFIX_$*).rpm-changelog | sed -e \
|
cat ../../build/unit-$(MODULE_SUFFIX_$*).rpm-changelog | sed -e \
|
||||||
"s/> - $(DEFAULT_VERSION)-$(DEFAULT_RELEASE)/> - $(MODULE_VERSION_$*)-$(MODULE_RELEASE_$*)/" \
|
"s/> - $(DEFAULT_VERSION)-$(DEFAULT_RELEASE)/> - $(MODULE_VERSION_$*)-$(MODULE_RELEASE_$*)/" \
|
||||||
>> $@.tmp
|
>> $@.tmp
|
||||||
mv $@.tmp $@
|
mv $@.tmp $@
|
||||||
|
|
||||||
unit-%: check-build-depends-% rpmbuild/SPECS/unit-%.spec rpmbuild/SOURCES/unit-$(VERSION).tar.gz
|
unit-%: check-build-depends-% rpmbuild/SPECS/unit-%.spec rpmbuild/SOURCES/unit-$(VERSION).tar.gz
|
||||||
@echo "===> Building $(subst _,-,$@) package" ; \
|
@echo "===> Building $(subst _,-,$@) package" ; \
|
||||||
|
|||||||
@@ -332,7 +332,7 @@ public class Util {
|
|||||||
|
|
||||||
public static List<DecoderEntry> getDecoders(
|
public static List<DecoderEntry> getDecoders(
|
||||||
List<Class<? extends Decoder>> decoderClazzes)
|
List<Class<? extends Decoder>> decoderClazzes)
|
||||||
throws DeploymentException{
|
throws DeploymentException {
|
||||||
|
|
||||||
List<DecoderEntry> result = new ArrayList<>();
|
List<DecoderEntry> result = new ArrayList<>();
|
||||||
if (decoderClazzes != null) {
|
if (decoderClazzes != null) {
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ package nginx.unit.websocket.server;
|
|||||||
import javax.servlet.http.HttpSessionEvent;
|
import javax.servlet.http.HttpSessionEvent;
|
||||||
import javax.servlet.http.HttpSessionListener;
|
import javax.servlet.http.HttpSessionListener;
|
||||||
|
|
||||||
public class WsSessionListener implements HttpSessionListener{
|
public class WsSessionListener implements HttpSessionListener {
|
||||||
|
|
||||||
private final WsServerContainer wsServerContainer;
|
private final WsServerContainer wsServerContainer;
|
||||||
|
|
||||||
|
|||||||
@@ -36,11 +36,11 @@ var idCounter = 0;
|
|||||||
function WebSocketConnection(socket, extensions, protocol, maskOutgoingPackets, config) {
|
function WebSocketConnection(socket, extensions, protocol, maskOutgoingPackets, config) {
|
||||||
this._debug = utils.BufferingLogger('websocket:connection', ++idCounter);
|
this._debug = utils.BufferingLogger('websocket:connection', ++idCounter);
|
||||||
this._debug('constructor');
|
this._debug('constructor');
|
||||||
|
|
||||||
if (this._debug.enabled) {
|
if (this._debug.enabled) {
|
||||||
instrumentSocketForDebugging(this, socket);
|
instrumentSocketForDebugging(this, socket);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Superclass Constructor
|
// Superclass Constructor
|
||||||
EventEmitter.call(this);
|
EventEmitter.call(this);
|
||||||
|
|
||||||
@@ -432,8 +432,8 @@ WebSocketConnection.prototype.processFrame = function(frame) {
|
|||||||
// logic to emit the ping frame: this is only done when a listener is known to exist
|
// logic to emit the ping frame: this is only done when a listener is known to exist
|
||||||
// Expose a function allowing the user to override the default ping() behavior
|
// Expose a function allowing the user to override the default ping() behavior
|
||||||
var cancelled = false;
|
var cancelled = false;
|
||||||
var cancel = function() {
|
var cancel = function() {
|
||||||
cancelled = true;
|
cancelled = true;
|
||||||
};
|
};
|
||||||
this.emit('ping', cancel, frame.binaryPayload);
|
this.emit('ping', cancel, frame.binaryPayload);
|
||||||
|
|
||||||
|
|||||||
@@ -247,7 +247,7 @@ WebSocketRequest.prototype.parseCookies = function(str) {
|
|||||||
|
|
||||||
WebSocketRequest.prototype.accept = function(acceptedProtocol, allowedOrigin, cookies) {
|
WebSocketRequest.prototype.accept = function(acceptedProtocol, allowedOrigin, cookies) {
|
||||||
this._verifyResolution();
|
this._verifyResolution();
|
||||||
|
|
||||||
// TODO: Handle extensions
|
// TODO: Handle extensions
|
||||||
|
|
||||||
var protocolFullCase;
|
var protocolFullCase;
|
||||||
@@ -418,7 +418,7 @@ WebSocketRequest.prototype.accept = function(acceptedProtocol, allowedOrigin, co
|
|||||||
// if (negotiatedExtensions) {
|
// if (negotiatedExtensions) {
|
||||||
// response += 'Sec-WebSocket-Extensions: ' + negotiatedExtensions.join(', ') + '\r\n';
|
// response += 'Sec-WebSocket-Extensions: ' + negotiatedExtensions.join(', ') + '\r\n';
|
||||||
// }
|
// }
|
||||||
|
|
||||||
// Mark the request resolved now so that the user can't call accept or
|
// Mark the request resolved now so that the user can't call accept or
|
||||||
// reject a second time.
|
// reject a second time.
|
||||||
this._resolved = true;
|
this._resolved = true;
|
||||||
@@ -447,12 +447,12 @@ WebSocketRequest.prototype.accept = function(acceptedProtocol, allowedOrigin, co
|
|||||||
|
|
||||||
WebSocketRequest.prototype.reject = function(status, reason, extraHeaders) {
|
WebSocketRequest.prototype.reject = function(status, reason, extraHeaders) {
|
||||||
this._verifyResolution();
|
this._verifyResolution();
|
||||||
|
|
||||||
// Mark the request resolved now so that the user can't call accept or
|
// Mark the request resolved now so that the user can't call accept or
|
||||||
// reject a second time.
|
// reject a second time.
|
||||||
this._resolved = true;
|
this._resolved = true;
|
||||||
this.emit('requestResolved', this);
|
this.emit('requestResolved', this);
|
||||||
|
|
||||||
if (typeof(status) !== 'number') {
|
if (typeof(status) !== 'number') {
|
||||||
status = 403;
|
status = 403;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -152,7 +152,7 @@ nxt_clone_credential_map_set(nxt_task_t *task, const char* mapfile, pid_t pid,
|
|||||||
return NXT_ERROR;
|
return NXT_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (i+1 < map->size) {
|
if (i + 1 < map->size) {
|
||||||
*p++ = '\n';
|
*p++ = '\n';
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
@@ -382,13 +382,13 @@ nxt_clone_vldt_credential_gidmap(nxt_task_t *task,
|
|||||||
m = map->map[j];
|
m = map->map[j];
|
||||||
|
|
||||||
if (!base_ok && creds->base_gid >= (nxt_gid_t) m.container
|
if (!base_ok && creds->base_gid >= (nxt_gid_t) m.container
|
||||||
&& creds->base_gid < (nxt_gid_t) (m.container+m.size))
|
&& creds->base_gid < (nxt_gid_t) (m.container + m.size))
|
||||||
{
|
{
|
||||||
base_ok = 1;
|
base_ok = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (creds->gids[i] >= (nxt_gid_t) m.container
|
if (creds->gids[i] >= (nxt_gid_t) m.container
|
||||||
&& creds->gids[i] < (nxt_gid_t) (m.container+m.size))
|
&& creds->gids[i] < (nxt_gid_t) (m.container + m.size))
|
||||||
{
|
{
|
||||||
gid_ok = 1;
|
gid_ok = 1;
|
||||||
break;
|
break;
|
||||||
@@ -405,7 +405,7 @@ nxt_clone_vldt_credential_gidmap(nxt_task_t *task,
|
|||||||
m = map->map[i];
|
m = map->map[i];
|
||||||
|
|
||||||
if (creds->base_gid >= (nxt_gid_t) m.container
|
if (creds->base_gid >= (nxt_gid_t) m.container
|
||||||
&& creds->base_gid < (nxt_gid_t) (m.container+m.size))
|
&& creds->base_gid < (nxt_gid_t) (m.container + m.size))
|
||||||
{
|
{
|
||||||
base_ok = 1;
|
base_ok = 1;
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ static nxt_int_t nxt_ssl_conf_commands(nxt_task_t *task, SSL_CTX *ctx,
|
|||||||
static nxt_int_t nxt_tls_ticket_keys(nxt_task_t *task, SSL_CTX *ctx,
|
static nxt_int_t nxt_tls_ticket_keys(nxt_task_t *task, SSL_CTX *ctx,
|
||||||
nxt_tls_init_t *tls_init, nxt_mp_t *mp);
|
nxt_tls_init_t *tls_init, nxt_mp_t *mp);
|
||||||
static int nxt_tls_ticket_key_callback(SSL *s, unsigned char *name,
|
static int nxt_tls_ticket_key_callback(SSL *s, unsigned char *name,
|
||||||
unsigned char *iv, EVP_CIPHER_CTX *ectx,HMAC_CTX *hctx, int enc);
|
unsigned char *iv, EVP_CIPHER_CTX *ectx, HMAC_CTX *hctx, int enc);
|
||||||
#endif
|
#endif
|
||||||
static void nxt_ssl_session_cache(SSL_CTX *ctx, size_t cache_size,
|
static void nxt_ssl_session_cache(SSL_CTX *ctx, size_t cache_size,
|
||||||
time_t timeout);
|
time_t timeout);
|
||||||
|
|||||||
@@ -2971,7 +2971,7 @@ nxt_router_tls_rpc_handler(nxt_task_t *task, nxt_port_recv_msg_t *msg,
|
|||||||
|
|
||||||
mp = tmcf->router_conf->mem_pool;
|
mp = tmcf->router_conf->mem_pool;
|
||||||
|
|
||||||
if (tls->socket_conf->tls == NULL){
|
if (tls->socket_conf->tls == NULL) {
|
||||||
tlscf = nxt_mp_zget(mp, sizeof(nxt_tls_conf_t));
|
tlscf = nxt_mp_zget(mp, sizeof(nxt_tls_conf_t));
|
||||||
if (nxt_slow_path(tlscf == NULL)) {
|
if (nxt_slow_path(tlscf == NULL)) {
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|||||||
@@ -322,15 +322,15 @@ nxt_socket_error(nxt_socket_t s)
|
|||||||
|
|
||||||
err = 0;
|
err = 0;
|
||||||
len = sizeof(int);
|
len = sizeof(int);
|
||||||
/*
|
/*
|
||||||
* Linux and BSDs return 0 and store a pending error in the err argument;
|
* Linux and BSDs return 0 and store a pending error in the err argument;
|
||||||
* Solaris returns -1 and sets the errno.
|
* Solaris returns -1 and sets the errno.
|
||||||
*/
|
*/
|
||||||
ret = getsockopt(s, SOL_SOCKET, SO_ERROR, (void *) &err, &len);
|
ret = getsockopt(s, SOL_SOCKET, SO_ERROR, (void *) &err, &len);
|
||||||
|
|
||||||
if (nxt_slow_path(ret == -1)) {
|
if (nxt_slow_path(ret == -1)) {
|
||||||
err = nxt_errno;
|
err = nxt_errno;
|
||||||
}
|
}
|
||||||
|
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -77,9 +77,9 @@ SYNOPSIS
|
|||||||
Subcommands
|
Subcommands
|
||||||
├── cmd [-h]
|
├── cmd [-h]
|
||||||
├── ctl [-h] [-s SOCK] SUBCOMMAND [ARGS]
|
├── ctl [-h] [-s SOCK] SUBCOMMAND [ARGS]
|
||||||
│ ├── edit [-h] PATH
|
│ ├── edit [-h] PATH
|
||||||
│ ├── http [-h] [-c CURLOPT] METHOD PATH
|
│ ├── http [-h] [-c CURLOPT] METHOD PATH
|
||||||
│ └── insert [-h] PATH INDEX
|
│ └── insert [-h] PATH INDEX
|
||||||
├── freeport [-h]
|
├── freeport [-h]
|
||||||
├── json-ins [-hn] JSON INDEX
|
├── json-ins [-hn] JSON INDEX
|
||||||
├── os-probe [-h]
|
├── os-probe [-h]
|
||||||
@@ -87,8 +87,8 @@ SYNOPSIS
|
|||||||
├── repo-config [-hn] [PKG-MANAGER OS-NAME OS-VERSION]
|
├── repo-config [-hn] [PKG-MANAGER OS-NAME OS-VERSION]
|
||||||
├── restart [-hls]
|
├── restart [-hls]
|
||||||
├── sock [-h] SUBCOMMAND [ARGS]
|
├── sock [-h] SUBCOMMAND [ARGS]
|
||||||
│ ├── filter [-chs]
|
│ ├── filter [-chs]
|
||||||
│ └── find [-h]
|
│ └── find [-h]
|
||||||
└── welcome [-hn]
|
└── welcome [-hn]
|
||||||
|
|
||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# unitc - a curl wrapper for configuring NGINX Unit
|
# unitc - a curl wrapper for configuring NGINX Unit
|
||||||
# https://github.com/nginx/unit/tree/master/tools
|
# https://github.com/nginx/unit/tree/master/tools
|
||||||
# NGINX, Inc. (c) 2023
|
# NGINX, Inc. (c) 2023
|
||||||
|
|
||||||
# Defaults
|
# Defaults
|
||||||
@@ -292,7 +292,7 @@ else
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
NEW_ELEMENT=$(cat ${CONF_FILES[@]})
|
NEW_ELEMENT=$(cat ${CONF_FILES[@]})
|
||||||
echo $NEW_ELEMENT | jq > /dev/null || exit $? # Test the input is valid JSON before proceeding
|
echo $NEW_ELEMENT | jq > /dev/null || exit $? # Test the input is valid JSON before proceeding
|
||||||
OLD_ARRAY=$($RPC_CMD curl -s $UNIT_CTRL$URI)
|
OLD_ARRAY=$($RPC_CMD curl -s $UNIT_CTRL$URI)
|
||||||
if [ "$(echo $OLD_ARRAY | jq -r type)" = "array" ]; then
|
if [ "$(echo $OLD_ARRAY | jq -r type)" = "array" ]; then
|
||||||
echo $OLD_ARRAY | jq ". |= [$NEW_ELEMENT] + ." | $RPC_CMD curl -X PUT --data-binary @- $UNIT_CTRL$URI 2> /tmp/${0##*/}.$$ | $OUTPUT
|
echo $OLD_ARRAY | jq ". |= [$NEW_ELEMENT] + ." | $RPC_CMD curl -X PUT --data-binary @- $UNIT_CTRL$URI 2> /tmp/${0##*/}.$$ | $OUTPUT
|
||||||
|
|||||||
Reference in New Issue
Block a user