diff options
| author | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:36:21 -0400 |
|---|---|---|
| committer | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:36:21 -0400 |
| commit | d29a4fd2dd3b5d4cf6e80b602544d7b71d794e76 (patch) | |
| tree | b38e2e5c6974b9a15f103e5cf884cba9fff90ef4 /ext/ldap | |
| parent | a88a88d0986a4a32288c102cdbfebd78d7e91d99 (diff) | |
| download | php-upstream/5.2.0.tar.gz | |
Imported Upstream version 5.2.0upstream/5.2.0
Diffstat (limited to 'ext/ldap')
| -rw-r--r-- | ext/ldap/config.m4 | 4 | ||||
| -rw-r--r-- | ext/ldap/ldap.c | 17 |
2 files changed, 12 insertions, 9 deletions
diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4 index 61d04f4da..cd6c755a9 100644 --- a/ext/ldap/config.m4 +++ b/ext/ldap/config.m4 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.39.2.6 2005/11/21 19:06:04 sniper Exp $ +dnl $Id: config.m4,v 1.39.2.6.2.1 2006/10/18 20:58:23 tony2001 Exp $ dnl AC_DEFUN([PHP_LDAP_CHECKS], [ @@ -70,7 +70,7 @@ PHP_ARG_WITH(ldap-sasl,for LDAP Cyrus SASL support, if test "$PHP_LDAP" != "no"; then - PHP_NEW_EXTENSION(ldap, ldap.c, $ext_shared) + PHP_NEW_EXTENSION(ldap, ldap.c, $ext_shared,,-DLDAP_DEPRECATED=1) if test "$PHP_LDAP" = "yes"; then for i in /usr/local /usr; do diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index 9a39f65aa..b8726c1ae 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -22,7 +22,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ldap.c,v 1.161.2.3 2006/01/01 12:50:08 sniper Exp $ */ +/* $Id: ldap.c,v 1.161.2.3.2.1 2006/06/15 18:33:07 dmitry Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -78,6 +78,7 @@ typedef struct { } ldap_resultentry; ZEND_DECLARE_MODULE_GLOBALS(ldap) +static PHP_GINIT_FUNCTION(ldap); static ZEND_BEGIN_ARG_INFO(arg3to6of6_force_ref, 0) @@ -177,7 +178,11 @@ zend_module_entry ldap_module_entry = { NULL, PHP_MINFO(ldap), NO_VERSION_YET, - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(ldap), + PHP_GINIT(ldap), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; #ifdef COMPILE_DL_LDAP @@ -222,9 +227,9 @@ PHP_INI_BEGIN() PHP_INI_END() /* }}} */ -/* {{{ php_ldap_init_globals +/* {{{ PHP_GINIT_FUNCTION */ -static void php_ldap_init_globals(zend_ldap_globals *ldap_globals) +static PHP_GINIT_FUNCTION(ldap) { ldap_globals->num_links = 0; } @@ -234,8 +239,6 @@ static void php_ldap_init_globals(zend_ldap_globals *ldap_globals) */ PHP_MINIT_FUNCTION(ldap) { - ZEND_INIT_MODULE_GLOBALS(ldap, php_ldap_init_globals, NULL); - REGISTER_INI_ENTRIES(); /* Constants to be used with deref-parameter in php_ldap_do_search() */ @@ -314,7 +317,7 @@ PHP_MINFO_FUNCTION(ldap) php_info_print_table_start(); php_info_print_table_row(2, "LDAP Support", "enabled"); - php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.161.2.3 2006/01/01 12:50:08 sniper Exp $"); + php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.161.2.3.2.1 2006/06/15 18:33:07 dmitry Exp $"); if (LDAPG(max_links) == -1) { snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links)); |