← Back to branch summary

~ubuntu-branches/ubuntu/lucid/php5/lucid

« back to all changes in this revision

Viewing changes to ext/standard/dns.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-03-16 09:09:50 UTC
  • mfrom: (1.1.18 upstream) (0.3.10 sid)
  • Revision ID: james.westby@ubuntu.com-20100316090950-e36m0pzranoixifd
Tags: 5.3.2-1ubuntu1
* Merge from debian unstable: 
  - debian/control:
    * Dropped firebird2.1-dev, libc-client-dev, libmcrypt-dev as it is in universe.
    * Dropped libmysqlclient15-dev, build against mysql 5.1.
    * Dropped libcurl-dev not in the archive.
    * Suggest php5-suhosin rather than recommends.
    * Dropped php5-imap, php5-interbase, php5-mcrypt since we have versions already in
      universe.
    * Dropped libonig-dev and libqgdbm since its in universe. (will be re-added in lucid+1)
    * Dropped locales-all.
  - modulelist: Drop imap, interbase, and mcrypt.
  - debian/rules:
    * Dropped building of mcrypt, imap, and interbase.
    * Install apport hook for php5.
  - Dropped debian/patches/libedit_is_editline.patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/standard/dns.c
18
18
   +----------------------------------------------------------------------+
19
19
 */
20
20
 
21
 
/* $Id: dns.c 287120 2009-08-11 22:07:35Z scottmac $ */
 
21
/* $Id: dns.c 292413 2009-12-21 15:22:40Z jani $ */
22
22
 
23
23
/* {{{ includes */
24
24
#include "php.h"
44
44
#undef T_UNSPEC
45
45
#endif
46
46
#if HAVE_ARPA_NAMESER_H
 
47
#ifdef DARWIN
 
48
# define BIND_8_COMPAT 1
 
49
#endif
47
50
#include <arpa/nameser.h>
48
51
#endif
49
 
#if HAVE_ARPA_NAMESER_COMPAT_H
50
 
#include <arpa/nameser_compat.h>
51
 
#endif
52
52
#if HAVE_RESOLV_H
53
53
#include <resolv.h>
54
54
#endif
810
810
                        n = php_dns_search(handle, hostname, C_IN, type_to_fetch, answer.qb2, sizeof answer);
811
811
 
812
812
                        if (n < 0) {
813
 
                                if (php_dns_errno(handle) == NO_DATA) {
814
 
                                        php_dns_free_handle(handle);
815
 
                                        continue;
816
 
                                }
817
 
 
818
813
                                php_dns_free_handle(handle);
819
 
                                zval_dtor(return_value);
820
 
                                RETURN_FALSE;
 
814
                                continue;
821
815
                        }
822
816
 
823
817
                        cp = answer.qb2 + HFIXEDSZ;