This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/8.0.x by this push:
new 145eeda Removes the TSUrlDestroy API, which has been a no-op for a
long time
145eeda is described below
commit 145eedad48643824f013c9a3d99150568eea3d59
Author: Leif Hedstrom <[email protected]>
AuthorDate: Sat Jun 16 07:40:13 2018 -0600
Removes the TSUrlDestroy API, which has been a no-op for a long time
(cherry picked from commit dff7ded82d0f89e5e1e4ae8d3a06383b620a36a4)
---
doc/.tx/config | 5 --
.../api/functions/TSUrlDestroy.en.rst | 44 --------------
.../plugins/http-headers/mime-headers.en.rst | 15 +++--
.../plugins/http-headers/urls.en.rst | 1 -
.../api/functions/TSUrlDestroy.en.po | 71 ----------------------
.../plugins/http-headers/mime-headers.en.po | 4 +-
.../plugins/http-headers/urls.en.po | 4 +-
proxy/api/ts/ts.h | 13 ----
src/traffic_server/InkAPI.cc | 5 --
9 files changed, 11 insertions(+), 151 deletions(-)
diff --git a/doc/.tx/config b/doc/.tx/config
index 6c1f2e5..fec2ade 100644
--- a/doc/.tx/config
+++ b/doc/.tx/config
@@ -1412,11 +1412,6 @@ file_filter =
locale/<lang>/LC_MESSAGES/developer-guide/api/functions/TSUrlCreat
source_file =
_build/locale/pot/developer-guide/api/functions/TSUrlCreate.en.pot
source_lang = en
-[apache-traffic-server-6x.developer-guide--api--functions--TSUrlDestroy_en]
-file_filter =
locale/<lang>/LC_MESSAGES/developer-guide/api/functions/TSUrlDestroy.en.po
-source_file =
_build/locale/pot/developer-guide/api/functions/TSUrlDestroy.en.pot
-source_lang = en
-
[apache-traffic-server-6x.developer-guide--api--functions--TSUrlFtpTypeGet_en]
file_filter =
locale/<lang>/LC_MESSAGES/developer-guide/api/functions/TSUrlFtpTypeGet.en.po
source_file =
_build/locale/pot/developer-guide/api/functions/TSUrlFtpTypeGet.en.pot
diff --git a/doc/developer-guide/api/functions/TSUrlDestroy.en.rst
b/doc/developer-guide/api/functions/TSUrlDestroy.en.rst
deleted file mode 100644
index e4709ea..0000000
--- a/doc/developer-guide/api/functions/TSUrlDestroy.en.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-.. Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed
- with this work for additional information regarding copyright
- ownership. The ASF licenses this file to you under the Apache
- License, Version 2.0 (the "License"); you may not use this file
- except in compliance with the License. You may obtain a copy of
- the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License.
-
-.. include:: ../../../common.defs
-
-.. default-domain:: c
-
-TSUrlDestroy
-************
-
-Synopsis
-========
-
-`#include <ts/ts.h>`
-
-.. function:: TSReturnCode TSUrlDestroy(TSMBuffer bufp, TSMLoc offset)
-
-Description
-===========
-
-Destroys the URL located at :arg:`url_loc` within the marshal buffer
-:arg:`bufp`.
-
-Do not forget to release the :type:`TSMLoc` url_loc with a call to
-:func:`TSHandleMLocRelease`.
-
-.. admonition:: Deprecated
-
- There is no reason to destroy the URL, just release the marshal buffers.
-
-Should be removed for v5.0.0
diff --git a/doc/developer-guide/plugins/http-headers/mime-headers.en.rst
b/doc/developer-guide/plugins/http-headers/mime-headers.en.rst
index 3aed615..7ab26e5 100644
--- a/doc/developer-guide/plugins/http-headers/mime-headers.en.rst
+++ b/doc/developer-guide/plugins/http-headers/mime-headers.en.rst
@@ -61,14 +61,13 @@ URL data structure (see :doc:`URLs <urls.en>`). The actual
data is stored in a
marshal buffer; the MIME header functions operate on a marshal buffer
and a location (``TSMLoc``) within the buffer.
-After a call to ``TSMimeHdrFieldDestroy``, ``TSMimeHdrFieldRemove``, or
-``TSUrlDestroy`` is made, you must deallocate the ``TSMLoc`` handle with
-a call to ``TSHandleMLocRelease``. You do not need to deallocate a
-``NULL`` handles. For example: if you call
-``TSMimeHdrFieldValueStringGet`` to get the value of the content type
-field and the field does not exist, then it returns ``TS_NULL_MLOC``. In
-such a case, you wouldn't need to deallocate the handle with a call to
-``TSHandleMLocRelease``.
+After a call to ``TSMimeHdrFieldDestroy`` or ``TSMimeHdrFieldRemove`` is
+made, you must deallocate the ``TSMLoc`` handle with a call to
+``TSHandleMLocRelease``. You do not need to deallocate a ``NULL`` handles.
+For example: if you call ``TSMimeHdrFieldValueStringGet`` to get the value of
+the content type field and the field does not exist, then it returns
+``TS_NULL_MLOC``. In such a case, you wouldn't need to deallocate the handle
+with a call to ``TSHandleMLocRelease``.
The location (``TSMLoc``) in the :ref:`MIME header
functions <MimeHeaderFxns>` can be either an HTTP header location or
diff --git a/doc/developer-guide/plugins/http-headers/urls.en.rst
b/doc/developer-guide/plugins/http-headers/urls.en.rst
index 7c90a77..700603b 100644
--- a/doc/developer-guide/plugins/http-headers/urls.en.rst
+++ b/doc/developer-guide/plugins/http-headers/urls.en.rst
@@ -130,7 +130,6 @@ Traffic Server **URL functions** are listed below:
:c:func:`TSUrlClone`
:c:func:`TSUrlCopy`
:c:func:`TSUrlCreate`
-:c:func:`TSUrlDestroy`
:c:func:`TSUrlPrint`
:c:func:`TSUrlFtpTypeGet`
:c:func:`TSUrlFtpTypeSet`
diff --git
a/doc/locale/ja/LC_MESSAGES/developer-guide/api/functions/TSUrlDestroy.en.po
b/doc/locale/ja/LC_MESSAGES/developer-guide/api/functions/TSUrlDestroy.en.po
deleted file mode 100644
index 15b3eb7..0000000
--- a/doc/locale/ja/LC_MESSAGES/developer-guide/api/functions/TSUrlDestroy.en.po
+++ /dev/null
@@ -1,71 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: Apache Traffic Server 6.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-02 21:32+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <[email protected]>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.1.1\n"
-
-#: ../../developer-guide/api/functions/TSUrlDestroy.en.rst:32
-msgid "Description"
-msgstr "解説"
-
-#: ../../developer-guide/api/functions/TSUrlDestroy.en.rst:25
-msgid "Synopsis"
-msgstr "概要"
-
-#: ../../developer-guide/api/functions/TSUrlDestroy.en.rst:22
-msgid "TSUrlDestroy"
-msgstr ""
-
-#: ../../developer-guide/api/functions/TSUrlDestroy.en.rst:27
-msgid "`#include <ts/ts.h>`"
-msgstr "`#include <ts/ts.h>`"
-
-#: ../../developer-guide/api/functions/TSUrlDestroy.en.rst:40
-msgid "Deprecated"
-msgstr ""
-
-#: ../../developer-guide/api/functions/TSUrlDestroy.en.rst:34
-msgid ""
-"Destroys the URL located at :arg:`url_loc` within the marshal buffer :arg:"
-"`bufp`."
-msgstr ""
-
-#: ../../developer-guide/api/functions/TSUrlDestroy.en.rst:37
-msgid ""
-"Do not forget to release the :type:`TSMLoc` url_loc with a call to :func:"
-"`TSHandleMLocRelease`."
-msgstr ""
-
-#: ../../developer-guide/api/functions/TSUrlDestroy.en.rst:44
-msgid "Should be removed for v5.0.0"
-msgstr ""
-
-#: ../../developer-guide/api/functions/TSUrlDestroy.en.rst:42
-msgid ""
-"There is no reason to destroy the URL, just release the marshal buffers."
-msgstr ""
diff --git
a/doc/locale/ja/LC_MESSAGES/developer-guide/plugins/http-headers/mime-headers.en.po
b/doc/locale/ja/LC_MESSAGES/developer-guide/plugins/http-headers/mime-headers.en.po
index 58b6971..2ec1c8c 100644
---
a/doc/locale/ja/LC_MESSAGES/developer-guide/plugins/http-headers/mime-headers.en.po
+++
b/doc/locale/ja/LC_MESSAGES/developer-guide/plugins/http-headers/mime-headers.en.po
@@ -77,8 +77,8 @@ msgstr ""
#: ../../../developer-guide/plugins/http-headers/mime-headers.en.rst:64
msgid ""
-"After a call to ``TSMimeHdrFieldDestroy``, ``TSMimeHdrFieldRemove``, or "
-"``TSUrlDestroy`` is made, you must deallocate the ``TSMLoc`` handle with a "
+"After a call to ``TSMimeHdrFieldDestroy`` or ``TSMimeHdrFieldRemove`` "
+"is made, you must deallocate the ``TSMLoc`` handle with a "
"call to ``TSHandleMLocRelease``. You do not need to deallocate a ``NULL`` "
"handles. For example: if you call ``TSMimeHdrFieldValueStringGet`` to get "
"the value of the content type field and the field does not exist, then it "
diff --git
a/doc/locale/ja/LC_MESSAGES/developer-guide/plugins/http-headers/urls.en.po
b/doc/locale/ja/LC_MESSAGES/developer-guide/plugins/http-headers/urls.en.po
index 9383ceb..2ad5555 100644
--- a/doc/locale/ja/LC_MESSAGES/developer-guide/plugins/http-headers/urls.en.po
+++ b/doc/locale/ja/LC_MESSAGES/developer-guide/plugins/http-headers/urls.en.po
@@ -172,8 +172,8 @@ msgstr ""
#: ../../../developer-guide/plugins/http-headers/urls.en.rst:109
msgid ""
-":c:func:`TSUrlClone` :c:func:`TSUrlCopy` :c:func:`TSUrlCreate` :c:func:"
-"`TSUrlDestroy` :c:func:`TSUrlPrint` :c:func:`TSUrlFtpTypeGet` :c:func:"
+":c:func:`TSUrlClone` :c:func:`TSUrlCopy` :c:func:`TSUrlCreate`"
+":c:func:`TSUrlPrint` :c:func:`TSUrlFtpTypeGet` :c:func:"
"`TSUrlFtpTypeSet` :c:func:`TSUrlHostGet` :c:func:`TSUrlHostSet` :c:func:"
"`TSUrlHttpFragmentGet` :c:func:`TSUrlHttpFragmentSet` :c:func:"
"`TSUrlHttpParamsGet` :c:func:`TSUrlHttpParamsSet` :c:func:"
diff --git a/proxy/api/ts/ts.h b/proxy/api/ts/ts.h
index 4347255..cc1a507 100644
--- a/proxy/api/ts/ts.h
+++ b/proxy/api/ts/ts.h
@@ -302,19 +302,6 @@ tsapi TSReturnCode TSMBufferDestroy(TSMBuffer bufp);
tsapi TSReturnCode TSUrlCreate(TSMBuffer bufp, TSMLoc *locp);
/**
- Destroys the URL located at url_loc within the marshal buffer
- bufp. Do not forget to release the TSMLoc url_loc with a call
- to TSHandleMLocRelease().
-
- @param bufp marshal buffer containing the URL to be destroyed.
- @param offset location of the URL to be destroyed.
-
- */
-/** @deprecated There is no reason to destroy the URL, just release
- the marshal buffers. Should be removed for v5.0.0 */
-tsapi TS_DEPRECATED TSReturnCode TSUrlDestroy(TSMBuffer bufp, TSMLoc offset);
-
-/**
Copies the URL located at src_url within src_bufp to a URL
location within the marshal buffer dest_bufp, and returns the
TSMLoc location of the copied URL. Unlike TSUrlCopy(), you do
diff --git a/src/traffic_server/InkAPI.cc b/src/traffic_server/InkAPI.cc
index 13bb88e..58474c0 100644
--- a/src/traffic_server/InkAPI.cc
+++ b/src/traffic_server/InkAPI.cc
@@ -2018,11 +2018,6 @@ TSUrlCreate(TSMBuffer bufp, TSMLoc *locp)
return TS_ERROR;
}
-TSReturnCode TSUrlDestroy(TSMBuffer /* bufp ATS_UNUSED */, TSMLoc /* url_loc
ATS_UNUSED */)
-{
- return TS_SUCCESS;
-}
-
TSReturnCode
TSUrlClone(TSMBuffer dest_bufp, TSMBuffer src_bufp, TSMLoc src_url, TSMLoc
*locp)
{
--
To stop receiving notification emails like this one, please contact
[email protected].
