Skip to content

Commit 8f60c4d

Browse files
shollenbeckshollenbeck
committed
Merge branch 'develop'
2 parents 94e0181 + a6af4ba commit 8f60c4d

File tree

121 files changed

+673
-218
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+673
-218
lines changed

‎ChangeLog

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
* 2015-10-31: Version 0.9.0
2+
* Updated for compatibility with getdns 0.5.0.
3+
* Added GETDNS_RETURN_NOT_IMPLEMENTED and
4+
GETDNS_RETURN_NOT_IMPLEMENTED_TEXT.
5+
* Added php_getdns_context_set_tls_authentication()
6+
and associated constants.
7+
18
* 2015-09-04: Version 0.8.2
29
* Modified tests to work with multiple getdns 0.3.x versions.
310

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
getdns-php
22
==========
33

4-
A PHP language binding for the getdns API, version 0.8.2.
4+
A PHP language binding for the getdns API, version 0.9.0.
55
This implementation is licensed under the New BSD License (BSD-new).
66

77
NOTE: THIS IS A BETA RELEASE!
88

99
Dependencies:
1010

1111
* PHP 5.x (PHP 5.6.8 was used for development and testing)
12-
* libgetdns 0.3.*
12+
* libgetdns 0.5.*
1313
* getdns library header files
1414

1515
The configure script will confirm that the dependencies have been met,

‎doc-in/constants.xml

+80
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,66 @@
286286
</simpara>
287287
</listitem>
288288
</varlistentry>
289+
<varlistentry xml:id="constant.getdns-return-not-implemented">
290+
<term>
291+
<constant>GETDNS_RETURN_NOT_IMPLEMENTED</constant>
292+
(<type>integer</type>)
293+
</term>
294+
<listitem>
295+
<simpara>
296+
</simpara>
297+
</listitem>
298+
</varlistentry>
299+
<varlistentry xml:id="constant.getdns-return-not-implemented-text">
300+
<term>
301+
<constant>GETDNS_RETURN_NOT_IMPLEMENTED_TEXT</constant>
302+
(<type>string</type>)
303+
</term>
304+
<listitem>
305+
<simpara>
306+
</simpara>
307+
</listitem>
308+
</varlistentry>
309+
<varlistentry xml:id="constant.getdns-authentication-none">
310+
<term>
311+
<constant>GETDNS_AUTHENTICATION_NONE</constant>
312+
(<type>integer</type>)
313+
</term>
314+
<listitem>
315+
<simpara>
316+
</simpara>
317+
</listitem>
318+
</varlistentry>
319+
<varlistentry xml:id="constant.getdns-authentication-none-text">
320+
<term>
321+
<constant>GETDNS_AUTHENTICATION_NONE_TEXT</constant>
322+
(<type>string</type>)
323+
</term>
324+
<listitem>
325+
<simpara>
326+
</simpara>
327+
</listitem>
328+
</varlistentry>
329+
<varlistentry xml:id="constant.getdns-authentication-hostname">
330+
<term>
331+
<constant>GETDNS_AUTHENTICATION_HOSTNAME</constant>
332+
(<type>integer</type>)
333+
</term>
334+
<listitem>
335+
<simpara>
336+
</simpara>
337+
</listitem>
338+
</varlistentry>
339+
<varlistentry xml:id="constant.getdns-authentication-hostname-text">
340+
<term>
341+
<constant>GETDNS_AUTHENTICATION_HOSTNAME_TEXT</constant>
342+
(<type>string</type>)
343+
</term>
344+
<listitem>
345+
<simpara>
346+
</simpara>
347+
</listitem>
348+
</varlistentry>
289349
<varlistentry xml:id="constant.getdns-respstatus-good">
290350
<term>
291351
<constant>GETDNS_RESPSTATUS_GOOD</constant>
@@ -1046,6 +1106,26 @@
10461106
</simpara>
10471107
</listitem>
10481108
</varlistentry>
1109+
<varlistentry xml:id="constant.getdns-context-code-tls-authentication">
1110+
<term>
1111+
<constant>GETDNS_CONTEXT_CODE_TLS_AUTHENTICATION</constant>
1112+
(<type>integer</type>)
1113+
</term>
1114+
<listitem>
1115+
<simpara>
1116+
</simpara>
1117+
</listitem>
1118+
</varlistentry>
1119+
<varlistentry xml:id="constant.getdns-context-code-tls-authentication-text">
1120+
<term>
1121+
<constant>GETDNS_CONTEXT_CODE_TLS_AUTHENTICATION_TEXT</constant>
1122+
(<type>string</type>)
1123+
</term>
1124+
<listitem>
1125+
<simpara>
1126+
</simpara>
1127+
</listitem>
1128+
</varlistentry>
10491129
<varlistentry xml:id="constant.getdns-context-code-upstream-recursive-servers">
10501130
<term>
10511131
<constant>GETDNS_CONTEXT_CODE_UPSTREAM_RECURSIVE_SERVERS</constant>

‎doc-in/entities.functions.xml

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
&reference.getdns.functions.php-getdns-context-set-return-dnssec-status;
4444
&reference.getdns.functions.php-getdns-context-set-suffix;
4545
&reference.getdns.functions.php-getdns-context-set-timeout;
46+
&reference.getdns.functions.php-getdns-context-set-tls-authentication;
4647
&reference.getdns.functions.php-getdns-context-set-update-callback;
4748
&reference.getdns.functions.php-getdns-context-set-upstream-recursive-servers;
4849
&reference.getdns.functions.php-getdns-context-set-use-threads;

‎doc-in/functions/php-getdns-context-set-tls-authentication.xml

+85
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- $Revision$ -->
3+
4+
<refentry xml:id="function.php-getdns-context-set-tls-authentication" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
5+
<refnamediv>
6+
<refname>php_getdns_context_set_tls_authentication</refname>
7+
<refpurpose>Set the TLS server authentication mode.</refpurpose>
8+
</refnamediv>
9+
10+
<refsect1 role="description">
11+
&reftitle.description;
12+
<methodsynopsis>
13+
<type>int</type><methodname>php_getdns_context_set_tls_authentication</methodname>
14+
<methodparam><type>int</type><parameter>context</parameter></methodparam>
15+
<methodparam><type>int</type><parameter>value</parameter></methodparam>
16+
</methodsynopsis>
17+
<para>
18+
This function can be used to set the mode for upstream server hostname
19+
authentication for TLS connections in stub mode. The stub resolver can
20+
require that a server provide a valid certificate (validated using the
21+
default CA repository) and that the hostname specified in the
22+
"tls_auth_name" field of the upstream dictionary matches the name in
23+
the certificate. The authentication setting is only enforced when the
24+
transport list contains only GETDNS_TRANSPORT_TLS, and in this case if
25+
authentication fails for all upstreams, queries will fail. If the
26+
transport list contains other clear text transports then opportunistic
27+
TLS will be performed which does not require authentication of the TLS
28+
connection.
29+
</para>
30+
</refsect1>
31+
32+
<refsect1 role="parameters">
33+
&reftitle.parameters;
34+
<variablelist>
35+
<varlistentry>
36+
<term><parameter>context</parameter></term>
37+
<listitem>
38+
<para>
39+
The previously created DNS context that is to be used with this request.
40+
</para>
41+
</listitem>
42+
</varlistentry>
43+
<varlistentry>
44+
<term><parameter>value</parameter></term>
45+
<listitem>
46+
<para>
47+
The value to be set. It must be either GETDNS_AUTHENTICATION_NONE
48+
(the default) or GETDNS_AUTHENTICATION_HOSTNAME to request host
49+
name validation.
50+
</para>
51+
</listitem>
52+
</varlistentry>
53+
</variablelist>
54+
</refsect1>
55+
56+
<refsect1 role="returnvalues">
57+
&reftitle.returnvalues;
58+
<para>
59+
This function returns an integer response code. GETDNS_RETURN_GOOD indicates successful completion.
60+
</para>
61+
</refsect1>
62+
63+
64+
</refentry>
65+
66+
<!-- Keep this comment at the end of the file
67+
Local variables:
68+
mode: sgml
69+
sgml-omittag:t
70+
sgml-shorttag:t
71+
sgml-minimize-attributes:nil
72+
sgml-always-quote-attributes:t
73+
sgml-indent-step:1
74+
sgml-indent-data:t
75+
indent-tabs-mode:nil
76+
sgml-parent-document:nil
77+
sgml-default-dtd-file:"~/.phpdoc/manual.ced"
78+
sgml-exposed-tags:nil
79+
sgml-local-catalogs:nil
80+
sgml-local-ecat-files:nil
81+
End:
82+
vim600: syn=xml fen fdm=syntax fdl=2 si
83+
vim: et tw=78 syn=sgml
84+
vi: ts=1 sw=1
85+
-->

0 commit comments

Comments
 (0)