Skip to content

Commit 1211b9f

Browse files
shollenbeckshollenbeck
committed
Merge branch 'develop'
2 parents f3a14a7 + fadedb0 commit 1211b9f

File tree

168 files changed

+4522
-375
lines changed

Some content is hidden

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

168 files changed

+4522
-375
lines changed

‎ChangeLog

+15
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
* 2016-01-15: Version 0.11.0
2+
* Updated for compatibility with getdns 0.9.0.
3+
* Removed GETDNS_TRANSPORT_STARTTLS and GETDNS_TRANSPORT_STARTTLS_TEXT.
4+
* Removed GETDNS_TRANSPORT_STARTTLS_FIRST_AND_FALL_BACK_TO_TCP_KEEP_CONNECTIONS_OPEN and
5+
GETDNS_TRANSPORT_STARTTLS_FIRST_AND_FALL_BACK_TO_TCP_KEEP_CONNECTIONS_OPEN_TEXT.
6+
* Made GETDNS_AUTHENTICATION_HOSTNAME an alias for GETDNS_AUTHENTICATION_REQUIRED.
7+
* Added new constants GETDNS_CONTEXT_CODE_PUBKEY_PINSET, GETDNS_CONTEXT_CODE_PUBKEY_PINSET_TEXT,
8+
GETDNS_RETURN_NEED_MORE_SPACE, and GETDNS_RETURN_NEED_MORE_SPACE_TEXT.
9+
* Added new functions getdns_pubkey_pin_create_from_string(),
10+
getdns_pubkey_pinset_sanity_check(),
11+
getdns_rr_dict2wire(), getdns_rr_dict2wire_buf(), getdns_rr_dict2wire_scan(),
12+
getdns_wire2rr_dict(), getdns_wire2rr_dict_buf(), getdns_wire2rr_dict_scan(),
13+
getdns_rr_dict2str(), getdns_rr_dict2str_buf(), getdns_rr_dict2str_scan(),
14+
getdns_str2rr_dict(), and getdns_fp2rr_list().
15+
116
* 2015-11-20: Version 0.10.0
217
* Updated for compatibility with getdns 0.5.1.
318
* Added php_getdns_context_get_tls_authentication()

‎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.10.0.
4+
A PHP language binding for the getdns API, version 0.11.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.5.*
12+
* libgetdns 0.9.*
1313
* getdns library header files
1414

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

‎doc-in/constants.xml

+53-42
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,26 @@
126126
</simpara>
127127
</listitem>
128128
</varlistentry>
129+
<varlistentry xml:id="constant.getdns-return-need-more-space">
130+
<term>
131+
<constant>GETDNS_RETURN_NEED_MORE_SPACE</constant>
132+
(<type>integer</type>)
133+
</term>
134+
<listitem>
135+
<simpara>
136+
</simpara>
137+
</listitem>
138+
</varlistentry>
139+
<varlistentry xml:id="constant.getdns-return-need-more-space-text">
140+
<term>
141+
<constant>GETDNS_RETURN_NEED_MORE_SPACE_TEXT</constant>
142+
(<type>string</type>)
143+
</term>
144+
<listitem>
145+
<simpara>
146+
</simpara>
147+
</listitem>
148+
</varlistentry>
129149
<varlistentry xml:id="constant.getdns-return-no-such-list-item">
130150
<term>
131151
<constant>GETDNS_RETURN_NO_SUCH_LIST_ITEM</constant>
@@ -331,14 +351,25 @@
331351
<constant>GETDNS_AUTHENTICATION_HOSTNAME</constant>
332352
(<type>integer</type>)
333353
</term>
354+
<listitem>
355+
<simpara>
356+
GETDNS_AUTHENTICATION_HOSTNAME is an alias for GETDNS_AUTHENTICATION_REQUIRED.
357+
</simpara>
358+
</listitem>
359+
</varlistentry>
360+
<varlistentry xml:id="constant.getdns-authentication-required">
361+
<term>
362+
<constant>GETDNS_AUTHENTICATION_REQUIRED</constant>
363+
(<type>integer</type>)
364+
</term>
334365
<listitem>
335366
<simpara>
336367
</simpara>
337368
</listitem>
338369
</varlistentry>
339-
<varlistentry xml:id="constant.getdns-authentication-hostname-text">
370+
<varlistentry xml:id="constant.getdns-authentication-required-text">
340371
<term>
341-
<constant>GETDNS_AUTHENTICATION_HOSTNAME_TEXT</constant>
372+
<constant>GETDNS_AUTHENTICATION_REQUIRED_TEXT</constant>
342373
(<type>string</type>)
343374
</term>
344375
<listitem>
@@ -906,46 +937,6 @@
906937
</simpara>
907938
</listitem>
908939
</varlistentry>
909-
<varlistentry xml:id="constant.getdns-transport-starttls">
910-
<term>
911-
<constant>GETDNS_TRANSPORT_STARTTLS</constant>
912-
(<type>integer</type>)
913-
</term>
914-
<listitem>
915-
<simpara>
916-
</simpara>
917-
</listitem>
918-
</varlistentry>
919-
<varlistentry xml:id="constant.getdns-transport-starttls-text">
920-
<term>
921-
<constant>GETDNS_TRANSPORT_STARTTLS_TEXT</constant>
922-
(<type>string</type>)
923-
</term>
924-
<listitem>
925-
<simpara>
926-
</simpara>
927-
</listitem>
928-
</varlistentry>
929-
<varlistentry xml:id="constant.getdns-transport-starttls-first-and-fall-back-to-tcp-keep-connections-open">
930-
<term>
931-
<constant>GETDNS_TRANSPORT_STARTTLS_FIRST_AND_FALL_BACK_TO_TCP_KEEP_CONNECTIONS_OPEN</constant>
932-
(<type>integer</type>)
933-
</term>
934-
<listitem>
935-
<simpara>
936-
</simpara>
937-
</listitem>
938-
</varlistentry>
939-
<varlistentry xml:id="constant.getdns-transport-starttls-first-and-fall-back-to-tcp-keep-connections-open-text">
940-
<term>
941-
<constant>GETDNS_TRANSPORT_STARTTLS_FIRST_AND_FALL_BACK_TO_TCP_KEEP_CONNECTIONS_OPEN_TEXT</constant>
942-
(<type>string</type>)
943-
</term>
944-
<listitem>
945-
<simpara>
946-
</simpara>
947-
</listitem>
948-
</varlistentry>
949940
<varlistentry xml:id="constant.getdns-append-name-always">
950941
<term>
951942
<constant>GETDNS_APPEND_NAME_ALWAYS</constant>
@@ -1086,6 +1077,26 @@
10861077
</simpara>
10871078
</listitem>
10881079
</varlistentry>
1080+
<varlistentry xml:id="constant.getdns-context-code-pubkey-pinset">
1081+
<term>
1082+
<constant>GETDNS_CONTEXT_CODE_PUBKEY_PINSET</constant>
1083+
(<type>integer</type>)
1084+
</term>
1085+
<listitem>
1086+
<simpara>
1087+
</simpara>
1088+
</listitem>
1089+
</varlistentry>
1090+
<varlistentry xml:id="constant.getdns-context-code-pubkey-pinset-text">
1091+
<term>
1092+
<constant>GETDNS_CONTEXT_CODE_PUBKEY_PINSET_TEXT</constant>
1093+
(<type>string</type>)
1094+
</term>
1095+
<listitem>
1096+
<simpara>
1097+
</simpara>
1098+
</listitem>
1099+
</varlistentry>
10891100
<varlistentry xml:id="constant.getdns-context-code-resolution-type">
10901101
<term>
10911102
<constant>GETDNS_CONTEXT_CODE_RESOLUTION_TYPE</constant>

‎doc-in/entities.functions.xml

+13
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
&reference.getdns.functions.php-getdns-dict-util-get-string;
7474
&reference.getdns.functions.php-getdns-dict-util-set-string;
7575
&reference.getdns.functions.php-getdns-display-ip-address;
76+
&reference.getdns.functions.php-getdns-fp2rr-list;
7677
&reference.getdns.functions.php-getdns-general-sync;
7778
&reference.getdns.functions.php-getdns-general;
7879
&reference.getdns.functions.php-getdns-get-api-version-number;
@@ -99,10 +100,22 @@
99100
&reference.getdns.functions.php-getdns-pretty-print-list;
100101
&reference.getdns.functions.php-getdns-print-json-dict;
101102
&reference.getdns.functions.php-getdns-print-json-list;
103+
&reference.getdns.functions.php-getdns-pubkey-pin-create-from-string;
104+
&reference.getdns.functions.php-getdns-pubkey-pinset-sanity-check;
102105
&reference.getdns.functions.php-getdns-root-trust-anchor;
106+
&reference.getdns.functions.php-getdns-rr-dict2str-buf;
107+
&reference.getdns.functions.php-getdns-rr-dict2str-scan;
108+
&reference.getdns.functions.php-getdns-rr-dict2str;
109+
&reference.getdns.functions.php-getdns-rr-dict2wire-buf;
110+
&reference.getdns.functions.php-getdns-rr-dict2wire-scan;
111+
&reference.getdns.functions.php-getdns-rr-dict2wire;
103112
&reference.getdns.functions.php-getdns-service-sync;
104113
&reference.getdns.functions.php-getdns-service;
114+
&reference.getdns.functions.php-getdns-str2rr-dict;
105115
&reference.getdns.functions.php-getdns-util-convert-array;
106116
&reference.getdns.functions.php-getdns-util-convert-dict;
107117
&reference.getdns.functions.php-getdns-util-convert-list;
108118
&reference.getdns.functions.php-getdns-validate-dnssec;
119+
&reference.getdns.functions.php-getdns-wire2rr-dict-buf;
120+
&reference.getdns.functions.php-getdns-wire2rr-dict-scan;
121+
&reference.getdns.functions.php-getdns-wire2rr-dict;

‎doc-in/functions/php-getdns-fp2rr-list.xml

+100
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- $Revision$ -->
3+
4+
<refentry xml:id="function.php-getdns-fp2rr-list" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
5+
<refnamediv>
6+
<refname>php_getdns_fp2rr_list</refname>
7+
<refpurpose>Convert the contents of a DNS zone file to getdns list format.</refpurpose>
8+
</refnamediv>
9+
10+
<refsect1 role="description">
11+
&reftitle.description;
12+
<methodsynopsis>
13+
<type>int</type><methodname>php_getdns_fp2rr_list</methodname>
14+
<methodparam><type>string</type><parameter>inFile</parameter></methodparam>
15+
<methodparam><type>int</type><parameter role="reference">list</parameter></methodparam>
16+
<methodparam><type>string</type><parameter>origin</parameter></methodparam>
17+
<methodparam><type>int</type><parameter>defaultTTL</parameter></methodparam>
18+
</methodsynopsis>
19+
<para>
20+
This function converts the contents of a DNS zone file to getdns list format.
21+
This list will contain dictionaries representing the resource records found in
22+
the zone file.
23+
</para>
24+
</refsect1>
25+
26+
<refsect1 role="parameters">
27+
&reftitle.parameters;
28+
<variablelist>
29+
<varlistentry>
30+
<term><parameter>inFile</parameter></term>
31+
<listitem>
32+
<para>
33+
A string containing the path to the file to be opened for reading.
34+
</para>
35+
</listitem>
36+
</varlistentry>
37+
<varlistentry>
38+
<term><parameter>list</parameter></term>
39+
<listitem>
40+
<para>
41+
On output this value will contain an integer representation of a list of
42+
dictionaries that describe the resource records found in the zone file.
43+
Note that this argument is passed by reference and any existing value will be
44+
overwritten. The client is responsible for calling php_getdns_list_destroy()
45+
when the list is no longer needed.
46+
</para>
47+
</listitem>
48+
</varlistentry>
49+
<varlistentry>
50+
<term><parameter>origin</parameter></term>
51+
<listitem>
52+
<para>
53+
A string that contains the default suffix to be used for any domain names
54+
that are not fully qualified.
55+
</para>
56+
</listitem>
57+
</varlistentry>
58+
<varlistentry>
59+
<term><parameter>defaultTTL</parameter></term>
60+
<listitem>
61+
<para>
62+
An integer that contains the default "time to live" (TTL) value to be used
63+
in building the dictionaries.
64+
</para>
65+
</listitem>
66+
</varlistentry>
67+
</variablelist>
68+
</refsect1>
69+
70+
<refsect1 role="returnvalues">
71+
&reftitle.returnvalues;
72+
<para>
73+
This function returns an integer response code. GETDNS_RETURN_GOOD indicates
74+
successful completion.
75+
</para>
76+
</refsect1>
77+
78+
79+
</refentry>
80+
81+
<!-- Keep this comment at the end of the file
82+
Local variables:
83+
mode: sgml
84+
sgml-omittag:t
85+
sgml-shorttag:t
86+
sgml-minimize-attributes:nil
87+
sgml-always-quote-attributes:t
88+
sgml-indent-step:1
89+
sgml-indent-data:t
90+
indent-tabs-mode:nil
91+
sgml-parent-document:nil
92+
sgml-default-dtd-file:"~/.phpdoc/manual.ced"
93+
sgml-exposed-tags:nil
94+
sgml-local-catalogs:nil
95+
sgml-local-ecat-files:nil
96+
End:
97+
vim600: syn=xml fen fdm=syntax fdl=2 si
98+
vim: et tw=78 syn=sgml
99+
vi: ts=1 sw=1
100+
-->

‎doc-in/functions/php-getdns-pubkey-pin-create-from-string.xml

+83
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- $Revision$ -->
3+
4+
<refentry xml:id="function.php-getdns-pubkey-pin-create-from-string" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
5+
<refnamediv>
6+
<refname>php_getdns_pubkey_pin_create_from_string</refname>
7+
<refpurpose>Convert an HTTP Public Key Pinning (HPKP)-style pin description to a dictionary.</refpurpose>
8+
</refnamediv>
9+
10+
<refsect1 role="description">
11+
&reftitle.description;
12+
<methodsynopsis>
13+
<type>int</type><methodname>php_getdns_pubkey_pin_create_from_string</methodname>
14+
<methodparam><type>int</type><parameter>context</parameter></methodparam>
15+
<methodparam><type>string</type><parameter>str</parameter></methodparam>
16+
</methodsynopsis>
17+
<para>
18+
This function converts an HTTP Public Key Pinning (HPKP)-style pin description
19+
to a getdns dictionary. An example string value is: (with the quotes, without
20+
any leading or trailing whitespace):
21+
</para>
22+
<para>
23+
pin-sha256="E9CZ9INDbd+2eRQozYqqbQ2yXLVKB9+xcprMF+44U1g="
24+
</para>
25+
</refsect1>
26+
27+
<refsect1 role="parameters">
28+
&reftitle.parameters;
29+
<variablelist>
30+
<varlistentry>
31+
<term><parameter>context</parameter></term>
32+
<listitem>
33+
<para>
34+
The previously created DNS context that is to be used with this request.
35+
The value of the context may be 0 (zero) to create a dictionary that is
36+
not associated with a particular context.
37+
</para>
38+
</listitem>
39+
</varlistentry>
40+
<varlistentry>
41+
<term><parameter>str</parameter></term>
42+
<listitem>
43+
<para>
44+
The pinning string to parse.
45+
</para>
46+
</listitem>
47+
</varlistentry>
48+
</variablelist>
49+
</refsect1>
50+
51+
<refsect1 role="returnvalues">
52+
&reftitle.returnvalues;
53+
<para>
54+
This function returns an integer representation of a getdns dictionary. The
55+
return value will be 0 (zero) if the input string could not be converted.
56+
It is the caller's responsibility to call php_getdns_dict_destroy() on
57+
the returned dictionary when it is no longer needed.
58+
</para>
59+
</refsect1>
60+
61+
62+
</refentry>
63+
64+
<!-- Keep this comment at the end of the file
65+
Local variables:
66+
mode: sgml
67+
sgml-omittag:t
68+
sgml-shorttag:t
69+
sgml-minimize-attributes:nil
70+
sgml-always-quote-attributes:t
71+
sgml-indent-step:1
72+
sgml-indent-data:t
73+
indent-tabs-mode:nil
74+
sgml-parent-document:nil
75+
sgml-default-dtd-file:"~/.phpdoc/manual.ced"
76+
sgml-exposed-tags:nil
77+
sgml-local-catalogs:nil
78+
sgml-local-ecat-files:nil
79+
End:
80+
vim600: syn=xml fen fdm=syntax fdl=2 si
81+
vim: et tw=78 syn=sgml
82+
vi: ts=1 sw=1
83+
-->

0 commit comments

Comments
 (0)