[trafficserver] branch master updated: Make TSUrlSchemeGet() return scheme implied by URL type when there is no explicit scheme. (#7262)

2021-01-19 Thread wkaras
This is an automated email from the ASF dual-hosted git repository.

wkaras pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
 new 7efaaa1  Make TSUrlSchemeGet() return scheme implied by URL type when 
there is no explicit scheme. (#7262)
7efaaa1 is described below

commit 7efaaa17962d4753607af2d600bcdf18dff9e172
Author: Walt Karas 
AuthorDate: Tue Jan 19 18:49:24 2021 -0600

Make TSUrlSchemeGet() return scheme implied by URL type when there is no 
explicit scheme. (#7262)

The original TSUrlSchemeGet() is renamed to TSUrlRawSchemeGet().  (This PR 
also includes
some unrelated improvements to the tsapi test case.)
---
 .../api/functions/TSUrlHostGet.en.rst  |   7 +-
 .../plugins/http-headers/urls.en.rst   |   7 +-
 include/ts/ts.h|  16 +
 src/traffic_server/InkAPI.cc   |  25 +-
 tests/Makefile.am  |   1 +
 .../pluginTest/tsapi/Makefile.inc} |  29 +-
 tests/gold_tests/pluginTest/tsapi/log.gold | 137 +++-
 tests/gold_tests/pluginTest/tsapi/test_tsapi.cc| 356 +
 tests/gold_tests/pluginTest/tsapi/tsapi.test.py|  30 +-
 tests/tools/plugins/Makefile.inc   |   3 -
 tests/tools/plugins/test_tsapi.cc  | 241 --
 11 files changed, 558 insertions(+), 294 deletions(-)

diff --git a/doc/developer-guide/api/functions/TSUrlHostGet.en.rst 
b/doc/developer-guide/api/functions/TSUrlHostGet.en.rst
index bb07176..139c04d 100644
--- a/doc/developer-guide/api/functions/TSUrlHostGet.en.rst
+++ b/doc/developer-guide/api/functions/TSUrlHostGet.en.rst
@@ -33,6 +33,7 @@ Synopsis
 
 .. function:: const char * TSUrlHostGet(TSMBuffer bufp, TSMLoc offset, int * 
length)
 .. function:: const char * TSUrlSchemeGet(TSMBuffer bufp, TSMLoc offset, int * 
length)
+.. function:: const char * TSUrlRawSchemeGet(TSMBuffer bufp, TSMLoc offset, 
int * length)
 .. function:: const char * TSUrlUserGet(TSMBuffer bufp, TSMLoc offset, int * 
length)
 .. function:: const char * TSUrlPasswordGet(TSMBuffer bufp, TSMLoc offset, 
int* length)
 .. function:: int TSUrlPortGet(TSMBuffer bufp, TSMLoc offset)
@@ -50,13 +51,17 @@ buffers. The URL functions can create, copy, retrieve or 
delete entire URLs,
 and retrieve or modify parts of URLs, such as their host, port or scheme
 information.
 
-:func:`TSUrlSchemeGet`, :func:`TSUrlUserGet`, :func:`TSUrlPasswordGet`,
+:func:`TSUrlSchemeGet`, :func:`TSUrlRawSchemeGet`, :func:`TSUrlUserGet`, 
:func:`TSUrlPasswordGet`,
 :func:`TSUrlHostGet`, :func:`TSUrlPathGet`, :func:`TSUrlHttpParamsGet`, 
:func:`TSUrlHttpQueryGet`
 and :func:`TSUrlHttpFragmentGet` each retrieve an internal pointer to the
 specified portion of the URL from the marshall buffer :arg:`bufp`. The length
 of the returned string is placed in :arg:`length` and a pointer to the URL
 portion is returned.
 
+If a request URL does not have a explicit scheme, :func:`TSUrlRawSchemeGet` 
will return null and
+set :arg:`length` to zero.  :func:`TSUrlSchemeGet`, will return the scheme 
corresponding to the
+URL type (HTTP or HTTPS) if there is no explicit scheme.
+
 :func:`TSUrlPortGet` retrieves the port number portion of the URL located at
 :arg:`offset` within the marshal buffer :arg:`bufp`. If there is no explicit
 port number in the URL, a canonicalized valued is returned based on the URL
diff --git a/doc/developer-guide/plugins/http-headers/urls.en.rst 
b/doc/developer-guide/plugins/http-headers/urls.en.rst
index 700603b..ab7a2da 100644
--- a/doc/developer-guide/plugins/http-headers/urls.en.rst
+++ b/doc/developer-guide/plugins/http-headers/urls.en.rst
@@ -121,9 +121,10 @@ one of the known values. If it is, then it stores a 
pointer into a
 global table (instead of storing the known value in the marshal buffer).
 The scheme values listed above are also pointers into this table. This
 allows simple pointer comparison of the value returned from
-``TSUrlSchemeGet`` with one of the values listed above. You should use
-the Traffic Server-defined values when referring to one of the known
-schemes, since doing so can prevent the possibility of spelling errors.
+``TSUrlSchemeGet`` or ``TSUrlRawSchemeGet`` with one of the values
+listed above. You should use the Traffic Server-defined values when
+referring to one of the known schemes, since doing so can prevent the
+possibility of spelling errors.
 
 Traffic Server **URL functions** are listed below:
 
diff --git a/include/ts/ts.h b/include/ts/ts.h
index 082eda1..c805a7a 100644
--- a/include/ts/ts.h
+++ b/include/ts/ts.h
@@ -431,6 +431,22 @@ tsapi char *TSUrlStringGet(TSMBuffer bufp, TSMLoc offset, 
int *length);
 @return The scheme portion of the URL, as a string.
 
  */
+tsapi const char *TSUrlRawSchemeGet(TSMBuffer bufp, TSMLoc offset, int 
*length);
+
+/**
+

[trafficserver] branch quic-latest updated (573035c -> c40d95a)

2021-01-19 Thread maskit
This is an automated email from the ASF dual-hosted git repository.

maskit pushed a change to branch quic-latest
in repository https://gitbox.apache.org/repos/asf/trafficserver.git.


from 573035c  Merge branch 'master' into quic-latest
 add faddc0c  Fix parent connect fail segfault (#7429)
 add 690ec54  Improve zlib detection logic (#7430)
 add a453668  Update documentation for TSSslSessionInsert (#7420)
 add e7dc287  Fix the Proxy Verifier AuTest extension to handle cert paths 
correctly (#7415)
 add 9a12173  Fix stall on outbound TLS handshake (#7432)
 add ecd70df  Fix a link error on traffi_quic command (#7433)
 add c40d95a  Merge branch 'master' into quic-latest

No new revisions were added by this update.

Summary of changes:
 build/zlib.m4 | 14 --
 doc/developer-guide/api/functions/TSSslSession.en.rst |  9 +
 iocore/net/quic/QUICPacketReceiveQueue.cc |  4 +++-
 proxy/http/HttpSM.cc  |  4 +---
 proxy/http/HttpTransact.cc|  4 
 tests/gold_tests/autest-site/verifier_client.test.ext | 12 
 tests/gold_tests/autest-site/verifier_server.test.ext | 13 +
 7 files changed, 26 insertions(+), 34 deletions(-)



[trafficserver] branch master updated: Fix a link error on traffi_quic command (#7433)

2021-01-19 Thread maskit
This is an automated email from the ASF dual-hosted git repository.

maskit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
 new ecd70df  Fix a link error on traffi_quic command (#7433)
ecd70df is described below

commit ecd70df36998e27224ddf018768baa9d724577de
Author: Masakazu Kitajo 
AuthorDate: Wed Jan 20 09:37:21 2021 +0900

Fix a link error on traffi_quic command (#7433)
---
 iocore/net/quic/QUICPacketReceiveQueue.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/iocore/net/quic/QUICPacketReceiveQueue.cc 
b/iocore/net/quic/QUICPacketReceiveQueue.cc
index a2aee1b..5ab1171 100644
--- a/iocore/net/quic/QUICPacketReceiveQueue.cc
+++ b/iocore/net/quic/QUICPacketReceiveQueue.cc
@@ -24,9 +24,11 @@
 #include "QUICPacketReceiveQueue.h"
 #include "QUICPacketHeaderProtector.h"
 #include "QUICPacketFactory.h"
-
 #include "QUICIntUtil.h"
 
+#include "P_UDPConnection.h"
+#include "P_UDPPacket.h"
+
 static bool
 is_vn(QUICVersion v)
 {



[trafficserver] branch master updated: Fix stall on outbound TLS handshake (#7432)

2021-01-19 Thread masaori
This is an automated email from the ASF dual-hosted git repository.

masaori pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
 new 9a12173  Fix stall on outbound TLS handshake (#7432)
9a12173 is described below

commit 9a121730229ddf1b3a8dba962f318a5bfd3e8b0f
Author: Masaori Koshiba 
AuthorDate: Wed Jan 20 09:13:03 2021 +0900

Fix stall on outbound TLS handshake (#7432)
---
 proxy/http/HttpSM.cc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 427e4a0..dcde8fd 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -6119,9 +6119,7 @@ HttpSM::attach_server_session(Http1ServerSession *s)
   // first tunnel was sometimes behind handled by the consumer of the
   // first tunnel instead of the producer of the second tunnel.
   // The real read is setup in setup_server_read_response_header()
-  //
-  // Keep the read disabled until setup_server_read_response_header
-  server_entry->read_vio = server_session->do_io_read(this, 0, nullptr);
+  server_entry->read_vio = server_session->do_io_read(this, 0, 
server_session->read_buffer);
 
   // Transfer control of the write side as well
   server_entry->write_vio = server_session->do_io_write(this, 0, nullptr);



[trafficserver] branch master updated: Fix the Proxy Verifier AuTest extension to handle cert paths correctly (#7415)

2021-01-19 Thread bneradt
This is an automated email from the ASF dual-hosted git repository.

bneradt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
 new e7dc287  Fix the Proxy Verifier AuTest extension to handle cert paths 
correctly (#7415)
e7dc287 is described below

commit e7dc28784bfa9f42afffc3b1ceffed905f0d282d
Author: Brian Neradt 
AuthorDate: Tue Jan 19 15:50:39 2021 -0600

Fix the Proxy Verifier AuTest extension to handle cert paths correctly 
(#7415)

None of our current AuTests use Proxy Verifier for TLS connections, but
if they do they'll need this fix to correctly copy down and reference
the needed certs in the Proxy Verifier invocations.
---
 tests/gold_tests/autest-site/verifier_client.test.ext | 12 
 tests/gold_tests/autest-site/verifier_server.test.ext | 13 +
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/tests/gold_tests/autest-site/verifier_client.test.ext 
b/tests/gold_tests/autest-site/verifier_client.test.ext
index 5d96fff..41ef41a 100755
--- a/tests/gold_tests/autest-site/verifier_client.test.ext
+++ b/tests/gold_tests/autest-site/verifier_client.test.ext
@@ -78,10 +78,8 @@ def _configure_client(obj, process, name, replay_path, 
http_ports=None,
 raise ValueError("Tried to use '{}' for --client-cert, but it 
is not "
  "a valid file.".format(ssl_cert))
 if ssl_cert:
-run_ssl_cert = ssl_cert
-if os.path.isfile(ssl_cert):
-run_ssl_cert = os.path.join(client_dir, 
os.path.basename(ssl_cert))
-process.Setup.Copy(ssl_cert, run_ssl_cert, CopyLogic.SoftFiles)
+run_ssl_cert = os.path.join(client_dir, os.path.basename(ssl_cert))
+process.Setup.Copy(ssl_cert, run_ssl_cert, CopyLogic.SoftFiles)
 command += ' --client-cert "{}" '.format(run_ssl_cert)
 
 if ca_cert == '':
@@ -92,10 +90,8 @@ def _configure_client(obj, process, name, replay_path, 
http_ports=None,
 raise ValueError("Tried to use '{}' for --ca-certs, but it is 
not "
  "a valid file.".format(ca_cert))
 if ca_cert:
-run_ca_cert = ca_cert
-if os.path.isfile(ca_cert):
-run_ca_cert = os.path.join(client_dir, 
os.path.basename(ca_cert))
-process.Setup.Copy(ca_cert, run_ca_cert, CopyLogic.SoftFiles)
+run_ca_cert = os.path.join(client_dir, os.path.basename(ca_cert))
+process.Setup.Copy(ca_cert, run_ca_cert, CopyLogic.SoftFiles)
 command += ' --ca-certs "{}" '.format(run_ca_cert)
 
 if other_args:
diff --git a/tests/gold_tests/autest-site/verifier_server.test.ext 
b/tests/gold_tests/autest-site/verifier_server.test.ext
index 3852e22..3fd7f44 100755
--- a/tests/gold_tests/autest-site/verifier_server.test.ext
+++ b/tests/gold_tests/autest-site/verifier_server.test.ext
@@ -78,10 +78,8 @@ def _configure_server(obj, process, name, replay_path, 
http_ports=None, https_po
 raise ValueError("Tried to use '{}' for --server-cert, but it 
is not "
  "a valid file.".format(ssl_cert))
 if ssl_cert:
-run_ssl_cert = ssl_cert
-if os.path.isfile(ssl_cert):
-run_ssl_cert = os.path.join(server_dir, 
os.path.basename(ssl_cert))
-process.Setup.Copy(ssl_cert, run_ssl_cert, CopyLogic.SoftFiles)
+run_ssl_cert = os.path.join(server_dir, os.path.basename(ssl_cert))
+process.Setup.Copy(ssl_cert, run_ssl_cert, CopyLogic.SoftFiles)
 command += ' --server-cert "{}" '.format(run_ssl_cert)
 
 if ca_cert == '':
@@ -92,10 +90,8 @@ def _configure_server(obj, process, name, replay_path, 
http_ports=None, https_po
 raise ValueError("Tried to use '{}' for --ca-certs, but it is 
not "
  "a valid file.".format(ca_cert))
 if ca_cert:
-run_ca_cert = ca_cert
-if os.path.isfile(ca_cert):
-run_ca_cert = os.path.join(server_dir, 
os.path.basename(ca_cert))
-process.Setup.Copy(ca_cert, run_ca_cert, CopyLogic.SoftFiles)
+run_ca_cert = os.path.join(server_dir, os.path.basename(ca_cert))
+process.Setup.Copy(ca_cert, run_ca_cert, CopyLogic.SoftFiles)
 command += ' --ca-certs "{}" '.format(run_ca_cert)
 
 if replay_path:
@@ -103,6 +99,7 @@ def _configure_server(obj, process, name, replay_path, 
http_ports=None, https_po
 run_replay_path = os.path.join(server_dir, 
os.path.basename(replay_path))
 process.Setup.Copy(replay_path, run_replay_path, CopyLogic.SoftFiles)
 command += "{} ".format(run_replay_path)
+
 if other_args:
 command += "{} ".format(other_args)
 process.Command = 

[trafficserver] branch 9.0.x updated: Updated ChangeLog

2021-01-19 Thread zwoop
This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 3b3b409  Updated ChangeLog
3b3b409 is described below

commit 3b3b409f5b6cc30c112103647b7e85d39de90661
Author: Leif Hedstrom 
AuthorDate: Tue Jan 19 11:36:29 2021 -0700

Updated ChangeLog
---
 CHANGELOG-9.0.1 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG-9.0.1 b/CHANGELOG-9.0.1
index c09ae7b..adfc818 100644
--- a/CHANGELOG-9.0.1
+++ b/CHANGELOG-9.0.1
@@ -1,4 +1,5 @@
 Changes with Apache Traffic Server 9.0.1
+  #7377 - Addresses some of the lock contention with HostStatus.
   #7395 - Replace ::exit() with _exit() to avoid secondary cleanup cores
-  #7352 - Clear call_sm on tunnel reset
-  #7401 - Fix unnecessary addition of Expires header
+  #7414 - Remove the warning messages
+  #7420 - Update documentation for TSSslSessionInsert



[trafficserver] branch 9.0.x updated: This PR aims to address some of the lock contention found and (#7377)

2021-01-19 Thread zwoop
This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 35949e5  This PR aims to address some of the lock contention found and 
(#7377)
35949e5 is described below

commit 35949e56568b23eda83cdfee3427843746ed7de5
Author: John J. Rushford 
AuthorDate: Fri Dec 18 07:50:06 2020 -0700

This PR aims to address some of the lock contention found and (#7377)

documented in Issue #7375.  In ParentConsistentHash::selectParent()
redunant calls to getHostStatus() are removed and 
HostStatus::getHostStatus()
has been changed to eliminate locking altogether if the hosts_statuses
map is empty ie, no hosts have been marked down using traffic_ctl.

(cherry picked from commit 3cc66a88481b44f076b3c861bc32f51342750559)
---
 proxy/ParentConsistentHash.cc| 9 -
 src/traffic_server/HostStatus.cc | 9 +
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/proxy/ParentConsistentHash.cc b/proxy/ParentConsistentHash.cc
index 568fba9..edd929d 100644
--- a/proxy/ParentConsistentHash.cc
+++ b/proxy/ParentConsistentHash.cc
@@ -202,8 +202,6 @@ ParentConsistentHash::selectParent(bool first_call, 
ParentResult *result, Reques
   pRec = nullptr;
 }
 if (firstCall) {
-  HostStatRec *hst= (pRec) ? 
pStatus.getHostStatus(pRec->hostname) : nullptr;
-  result->first_choice_status = (hst) ? hst->status : 
HostStatus_t::HOST_STATUS_UP;
   break;
 }
   } while (pRec && !firstCall && last_lookup == PRIMARY && 
strcmp(pRec->hostname, result->hostname) == 0);
@@ -217,6 +215,10 @@ ParentConsistentHash::selectParent(bool first_call, 
ParentResult *result, Reques
   // didn't find a parent or the parent is marked unavailable or the parent is 
marked down
   HostStatRec *hst = (pRec) ? pStatus.getHostStatus(pRec->hostname) : nullptr;
   host_stat= (hst) ? hst->status : HostStatus_t::HOST_STATUS_UP;
+  if (firstCall) {
+result->first_choice_status = host_stat;
+  }
+
   // if the config ignore_self_detect is set to true and the host is down due 
to SELF_DETECT reason
   // ignore the down status and mark it as avaialble
   if ((pRec && result->rec->ignore_self_detect) && (hst && hst->status == 
HOST_STATUS_DOWN)) {
@@ -313,9 +315,6 @@ ParentConsistentHash::selectParent(bool first_call, 
ParentResult *result, Reques
   // Validate and return the final result.
   // 

 
-  // use the available or marked for retry parent.
-  hst   = (pRec) ? pStatus.getHostStatus(pRec->hostname) : nullptr;
-  host_stat = (hst) ? hst->status : HostStatus_t::HOST_STATUS_UP;
   // if the config ignore_self_detect is set to true and the host is down due 
to SELF_DETECT reason
   // ignore the down status and mark it as avaialble
   if ((pRec && result->rec->ignore_self_detect) && (hst && hst->status == 
HOST_STATUS_DOWN)) {
diff --git a/src/traffic_server/HostStatus.cc b/src/traffic_server/HostStatus.cc
index ea43722..00ccb76 100644
--- a/src/traffic_server/HostStatus.cc
+++ b/src/traffic_server/HostStatus.cc
@@ -365,6 +365,15 @@ HostStatus::getHostStatus(const char *name)
   time_t now   = time(0);
   bool lookup  = false;
 
+  // if host_statuses is empty, just return
+  // a nullptr as there is no need to lock
+  // and search.  A return of nullptr indicates
+  // to the caller that the host is available,
+  // HOST_STATUS_UP.
+  if (hosts_statuses.empty()) {
+return _status;
+  }
+
   // the hash table value pointer has the HostStatus_t value.
   ink_rwlock_rdlock(_status_rwlock);
   {



[trafficserver] branch 9.0.x updated: Update documentation for TSSslSessionInsert (#7420)

2021-01-19 Thread zwoop
This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 6c877d9  Update documentation for TSSslSessionInsert (#7420)
6c877d9 is described below

commit 6c877d938e08ef56061d54b2440bbb5d46f702cb
Author: Bryan Call 
AuthorDate: Tue Jan 19 07:29:15 2021 -0800

Update documentation for TSSslSessionInsert (#7420)

(cherry picked from commit a453668026b5c4cc171beadfc5747ec849d4e321)
---
 doc/developer-guide/api/functions/TSSslSession.en.rst | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/developer-guide/api/functions/TSSslSession.en.rst 
b/doc/developer-guide/api/functions/TSSslSession.en.rst
index 7b26587..8a3aadf 100644
--- a/doc/developer-guide/api/functions/TSSslSession.en.rst
+++ b/doc/developer-guide/api/functions/TSSslSession.en.rst
@@ -30,7 +30,7 @@ Synopsis
 
 .. function:: TSSslSession TSSslSessionGet(const TSSslSessionID * sessionid)
 .. function:: int TSSslSessionGetBuffer(const TSSslSessionID * sessionid, char 
* buffer, int * len_ptr)
-.. function:: TSReturnCode TSSslSessionInsert(const TSSslSessionID * 
sessionid, TSSslSession addSession)
+.. function:: TSReturnCode TSSslSessionInsert(const TSSslSessionID * 
sessionid, TSSslSession addSession, TSSslConnection ssl_conn)
 .. function:: TSReturnCode TSSslSessionRemove(const TSSslSessionID * sessionid)
 .. function:: void TSSslTicketKeyUpdate(char * ticketData, int 
ticketDataLength)
 
@@ -54,7 +54,8 @@ returns 0.
 
 :func:`TSSslSessionGetBuffer` returns the session information serialized in a 
buffer that can be shared between processes.
 When the function is called len_ptr should point to the amount of space
-available in the buffer parameter.  The function returns the amount of data 
really needed to encode the session.  len_ptr is updated with the amount of 
data actually stored in the buffer.
+available in the buffer parameter.  The function returns the amount of data 
really needed to encode the session.  len_ptr is
+updated with the amount of data actually stored in the buffer.
 :func:`TSSslSessionGetBuffer` will not overrun the provided buffer, but the 
caller should ensure that the data's size was not larger
 than the buffer by comparing the returned value with the value of len_ptr. If 
the returned value is larger than the buffer size,
 then the session data did not fit in the buffer and the session data stored in 
the buffer output variable should not be used.
@@ -69,5 +70,5 @@ If there is already an entry in the cache for the session id 
key, it is first re
 updating the session ticket encrypt key file with new data and reloading the 
current ATS process.  However, this API does not
 require writing session ticket encryption keys to disk.
 
-If both the ticket key files and :func:`TSSslTicketKeyUpdate` are used to 
update session ticket encryption keys, ATS will use the most recent update
-regardless if whether it was made by file and configuration reload or API.
+If both the ticket key files and :func:`TSSslTicketKeyUpdate` are used to 
update session ticket encryption keys, ATS will use the
+most recent update regardless if whether it was made by file and configuration 
reload or API.



[trafficserver] branch master updated: Update documentation for TSSslSessionInsert (#7420)

2021-01-19 Thread zwoop
This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
 new a453668  Update documentation for TSSslSessionInsert (#7420)
a453668 is described below

commit a453668026b5c4cc171beadfc5747ec849d4e321
Author: Bryan Call 
AuthorDate: Tue Jan 19 07:29:15 2021 -0800

Update documentation for TSSslSessionInsert (#7420)
---
 doc/developer-guide/api/functions/TSSslSession.en.rst | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/developer-guide/api/functions/TSSslSession.en.rst 
b/doc/developer-guide/api/functions/TSSslSession.en.rst
index 7b26587..8a3aadf 100644
--- a/doc/developer-guide/api/functions/TSSslSession.en.rst
+++ b/doc/developer-guide/api/functions/TSSslSession.en.rst
@@ -30,7 +30,7 @@ Synopsis
 
 .. function:: TSSslSession TSSslSessionGet(const TSSslSessionID * sessionid)
 .. function:: int TSSslSessionGetBuffer(const TSSslSessionID * sessionid, char 
* buffer, int * len_ptr)
-.. function:: TSReturnCode TSSslSessionInsert(const TSSslSessionID * 
sessionid, TSSslSession addSession)
+.. function:: TSReturnCode TSSslSessionInsert(const TSSslSessionID * 
sessionid, TSSslSession addSession, TSSslConnection ssl_conn)
 .. function:: TSReturnCode TSSslSessionRemove(const TSSslSessionID * sessionid)
 .. function:: void TSSslTicketKeyUpdate(char * ticketData, int 
ticketDataLength)
 
@@ -54,7 +54,8 @@ returns 0.
 
 :func:`TSSslSessionGetBuffer` returns the session information serialized in a 
buffer that can be shared between processes.
 When the function is called len_ptr should point to the amount of space
-available in the buffer parameter.  The function returns the amount of data 
really needed to encode the session.  len_ptr is updated with the amount of 
data actually stored in the buffer.
+available in the buffer parameter.  The function returns the amount of data 
really needed to encode the session.  len_ptr is
+updated with the amount of data actually stored in the buffer.
 :func:`TSSslSessionGetBuffer` will not overrun the provided buffer, but the 
caller should ensure that the data's size was not larger
 than the buffer by comparing the returned value with the value of len_ptr. If 
the returned value is larger than the buffer size,
 then the session data did not fit in the buffer and the session data stored in 
the buffer output variable should not be used.
@@ -69,5 +70,5 @@ If there is already an entry in the cache for the session id 
key, it is first re
 updating the session ticket encrypt key file with new data and reloading the 
current ATS process.  However, this API does not
 require writing session ticket encryption keys to disk.
 
-If both the ticket key files and :func:`TSSslTicketKeyUpdate` are used to 
update session ticket encryption keys, ATS will use the most recent update
-regardless if whether it was made by file and configuration reload or API.
+If both the ticket key files and :func:`TSSslTicketKeyUpdate` are used to 
update session ticket encryption keys, ATS will use the
+most recent update regardless if whether it was made by file and configuration 
reload or API.



[trafficserver] branch 9.0.x updated: Remove the warning statement (#7414)

2021-01-19 Thread zwoop
This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new d95498a  Remove the warning statement (#7414)
d95498a is described below

commit d95498a798b093502764e1abb8c79064f3e69bcf
Author: Vijay Mamidi 
AuthorDate: Fri Jan 8 09:24:52 2021 -0800

Remove the warning statement (#7414)

(cherry picked from commit a884cc1432015be1376896ff1bcd83f8ca34594e)
---
 iocore/net/UnixNetVConnection.cc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/iocore/net/UnixNetVConnection.cc b/iocore/net/UnixNetVConnection.cc
index 0d5ad00..2d8f44f 100644
--- a/iocore/net/UnixNetVConnection.cc
+++ b/iocore/net/UnixNetVConnection.cc
@@ -91,7 +91,6 @@ read_signal_and_update(int event, UnixNetVConnection *vc)
 case VC_EVENT_ACTIVE_TIMEOUT:
 case VC_EVENT_INACTIVITY_TIMEOUT:
   Debug("inactivity_cop", "event %d: null read.vio cont, closing vc %p", 
event, vc);
-  Warning("read: Closing orphaned vc %p", vc);
   vc->closed = 1;
   break;
 default:
@@ -126,7 +125,6 @@ write_signal_and_update(int event, UnixNetVConnection *vc)
 case VC_EVENT_ACTIVE_TIMEOUT:
 case VC_EVENT_INACTIVITY_TIMEOUT:
   Debug("inactivity_cop", "event %d: null write.vio cont, closing vc %p", 
event, vc);
-  Warning("write: Closing orphaned vc %p", vc);
   vc->closed = 1;
   break;
 default: