[PHP-CVS] svn: /php/php-src/trunk/ext/mysqlnd/ mysqlnd.c mysqlnd_net.c mysqlnd_ps.c mysqlnd_result.c
andrey Fri, 18 Mar 2011 12:33:17 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=309381
Log:
less trace info
Changed paths:
U php/php-src/trunk/ext/mysqlnd/mysqlnd.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2011-03-18 12:05:16 UTC (rev 309380)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2011-03-18 12:33:17 UTC (rev 309381)
@@ -138,47 +138,38 @@
DBG_INF(Freeing memory of members);
if (conn-host) {
- DBG_INF(Freeing host);
mnd_pefree(conn-host, pers);
conn-host = NULL;
}
if (conn-user) {
- DBG_INF(Freeing user);
mnd_pefree(conn-user, pers);
conn-user = NULL;
}
if (conn-passwd) {
- DBG_INF(Freeing passwd);
mnd_pefree(conn-passwd, pers);
conn-passwd = NULL;
}
if (conn-connect_or_select_db) {
- DBG_INF(Freeing connect_or_select_db);
mnd_pefree(conn-connect_or_select_db, pers);
conn-connect_or_select_db = NULL;
}
if (conn-unix_socket) {
- DBG_INF(Freeing unix_socket);
mnd_pefree(conn-unix_socket, pers);
conn-unix_socket = NULL;
}
if (conn-scheme) {
- DBG_INF(Freeing scheme);
mnd_pefree(conn-scheme, pers);
conn-scheme = NULL;
}
if (conn-server_version) {
- DBG_INF(Freeing server_version);
mnd_pefree(conn-server_version, pers);
conn-server_version = NULL;
}
if (conn-host_info) {
- DBG_INF(Freeing host_info);
mnd_pefree(conn-host_info, pers);
conn-host_info = NULL;
}
if (conn-auth_plugin_data) {
- DBG_INF(Freeing auth_plugin_data);
mnd_pefree(conn-auth_plugin_data, pers);
conn-auth_plugin_data = NULL;
}
@@ -205,13 +196,11 @@
conn-m-free_options(conn TSRMLS_CC);
if (conn-net) {
- DBG_INF(Freeing net);
mysqlnd_net_free(conn-net TSRMLS_CC);
conn-net = NULL;
}
if (conn-protocol) {
- DBG_INF(Freeing protocol);
mysqlnd_protocol_free(conn-protocol TSRMLS_CC);
conn-protocol = NULL;
}
@@ -2168,12 +2157,10 @@
#endif
#ifdef MYSQLND_STRING_TO_INT_CONVERSION
case MYSQLND_OPT_INT_AND_FLOAT_NATIVE:
- DBG_INF(MYSQLND_OPT_INT_AND_FLOAT_NATIVE);
conn-options.int_and_float_native = *(unsigned int*) value;
break;
#endif
case MYSQL_OPT_LOCAL_INFILE:
- DBG_INF(MYSQL_OPT_LOCAL_INFILE);
if (!value || (*(unsigned int*) value) ? 1 : 0) {
conn-options.flags |= CLIENT_LOCAL_FILES;
} else {
@@ -2184,8 +2171,6 @@
{
char ** new_init_commands;
char * new_command;
- DBG_INF(MYSQL_INIT_COMMAND);
- DBG_INF_FMT(command=%s, value);
/* when num_commands is 0, then realloc will be effectively a malloc call, internally */
/* Don't assign to conn-options.init_commands because in case of OOM we will lose the pointer and leak */
new_init_commands = mnd_perealloc(conn-options.init_commands, sizeof(char *) * (conn-options.num_commands + 1), conn-persistent);
@@ -2212,7 +2197,6 @@
case MYSQL_SET_CHARSET_NAME:
{
char * new_charset_name = mnd_pestrdup(value, conn-persistent);
- DBG_INF(MYSQL_SET_CHARSET_NAME);
if (!new_charset_name) {
goto oom;
}
@@ -2251,7 +2235,6 @@
case MYSQLND_OPT_AUTH_PROTOCOL:
{
char * new_auth_protocol = value? mnd_pestrdup(value, conn-persistent) : NULL;
- DBG_INF(MYSQLND_OPT_AUTH_PROTOCOL);
if (value !new_auth_protocol) {
goto oom;
}
@@ -2294,8 +2277,7 @@
/* Nothing to store for UPSERT/LOAD DATA */
if (conn-last_query_type != QUERY_SELECT || CONN_GET_STATE(conn) != CONN_FETCHING_DATA) {
- SET_CLIENT_ERROR(conn-error_info, CR_COMMANDS_OUT_OF_SYNC, UNKNOWN_SQLSTATE,
- mysqlnd_out_of_sync);
+ SET_CLIENT_ERROR(conn-error_info, CR_COMMANDS_OUT_OF_SYNC, UNKNOWN_SQLSTATE, mysqlnd_out_of_sync);
DBG_ERR(Command out of sync);
DBG_RETURN(NULL);
}
@@ -2330,8 +2312,7 @@
/* Nothing to store for UPSERT/LOAD DATA*/
if (conn-last_query_type != QUERY_SELECT || CONN_GET_STATE(conn) != CONN_FETCHING_DATA) {
- SET_CLIENT_ERROR(conn-error_info, CR_COMMANDS_OUT_OF_SYNC, UNKNOWN_SQLSTATE,
- mysqlnd_out_of_sync);
+ SET_CLIENT_ERROR(conn-error_info, CR_COMMANDS_OUT_OF_SYNC, UNKNOWN_SQLSTATE, mysqlnd_out_of_sync);
DBG_ERR(Command out of sync);
DBG_RETURN(NULL);
}
@@ -2355,7 +2336,6 @@
TSRMLS_DC ZEND_FILE_LINE_DC)
{
DBG_ENTER(mysqlnd_conn::get_connection_stats);
- DBG_INF_FMT(conn=%llu, conn-thread_id);
mysqlnd_fill_stats_hash(conn-stats, mysqlnd_stats_values_names, return_value TSRMLS_CC ZEND_FILE_LINE_CC);
DBG_VOID_RETURN;
}
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c 2011-03-18 12:05:16 UTC (rev 309380)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c 2011-03-18 12:33:17 UTC (rev 309381)
@@ -68,7 +68,7
[PHP-CVS] svn: /php/php-src/trunk/ext/mysqlnd/ mysqlnd.h mysqlnd_ps.c mysqlnd_structs.h
andrey Fri, 18 Mar 2011 13:35:33 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=309382
Log:
new function/methods - mysqlnd_stmt_flush. Removing
code duplication
Changed paths:
U php/php-src/trunk/ext/mysqlnd/mysqlnd.h
U php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_structs.h
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.h 2011-03-18 12:33:17 UTC (rev
309381)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.h 2011-03-18 13:35:33 UTC (rev
309382)
@@ -261,6 +261,7 @@
#definemysqlnd_stmt_free_result(stmt)
(stmt)-m-free_result((stmt) TSRMLS_CC)
#definemysqlnd_stmt_close(stmt, implicit) (stmt)-m-dtor((stmt),
(implicit) TSRMLS_CC)
#definemysqlnd_stmt_reset(stmt)
(stmt)-m-reset((stmt) TSRMLS_CC)
+#definemysqlnd_stmt_flush(stmt)
(stmt)-m-flush((stmt) TSRMLS_CC)
#define mysqlnd_stmt_attr_get(stmt, attr, value)
(stmt)-m-get_attribute((stmt), (attr), (value) TSRMLS_CC)
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c 2011-03-18 12:33:17 UTC (rev
309381)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c 2011-03-18 13:35:33 UTC (rev
309382)
@@ -628,28 +628,8 @@
}
#endif
- /*
- If right after execute() we have to call the appropriate
- use_result() or store_result() and clean.
- */
- if (stmt-state == MYSQLND_STMT_WAITING_USE_OR_STORE) {
- DBG_INF(fetching result set header);
- /* Do implicit use_result and then flush the result */
- stmt-default_rset_handler = s-m-use_result;
- stmt-default_rset_handler(s TSRMLS_CC);
- }
+ s-m-flush(s TSRMLS_CC);
- if (stmt-state MYSQLND_STMT_WAITING_USE_OR_STORE) {
- DBG_INF(skipping result);
- /* Flush if anything is left and unbuffered set */
- stmt-result-m.skip_result(stmt-result TSRMLS_CC);
- }
-
- if (stmt-state MYSQLND_STMT_PREPARED) {
- /* As the buffers have been freed, we should go back to
PREPARED */
- stmt-state = MYSQLND_STMT_PREPARED;
- }
-
/*
Executed, but the user hasn't started to fetch
This will clean also the metadata, but after the EXECUTE call
we will
@@ -1228,7 +1208,46 @@
}
}
+ s-m-flush(s TSRMLS_CC);
+
/*
+ Don't free now, let the result be usable. When the stmt will
again be
+ executed then the result set will be cleaned, the bound
variables will
+ be separated before that.
+ */
+
+ int4store(cmd_buf, stmt-stmt_id);
+ if (CONN_GET_STATE(conn) == CONN_READY
+ FAIL == (ret = conn-m-simple_command(conn,
COM_STMT_RESET, cmd_buf,
+
sizeof(cmd_buf), PROT_OK_PACKET,
+
FALSE, TRUE TSRMLS_CC))) {
+ stmt-error_info = conn-error_info;
+ }
+ stmt-upsert_status = conn-upsert_status;
+
+ stmt-state = MYSQLND_STMT_PREPARED;
+ }
+ DBG_INF(ret == PASS? PASS:FAIL);
+ DBG_RETURN(ret);
+}
+/* }}} */
+
+
+/* {{{ mysqlnd_stmt::flush */
+static enum_func_status
+MYSQLND_METHOD(mysqlnd_stmt, flush)(MYSQLND_STMT * const s TSRMLS_DC)
+{
+ MYSQLND_STMT_DATA * stmt = s? s-data:NULL;
+ enum_func_status ret = PASS;
+
+ DBG_ENTER(mysqlnd_stmt::flush);
+ if (!stmt || !stmt-conn) {
+ DBG_RETURN(FAIL);
+ }
+ DBG_INF_FMT(stmt=%lu, stmt-stmt_id);
+
+ if (stmt-stmt_id) {
+ /*
If the user decided to close the statement right after
execute()
We have to call the appropriate use_result() or
store_result() and
clean.
@@ -1246,21 +1265,6 @@
}
} while (mysqlnd_stmt_more_results(s)
mysqlnd_stmt_next_result(s) == PASS);
- /*
- Don't free now, let the result be usable. When the stmt will
again be
- executed then the result set will be cleaned, the bound
variables will
- be separated before that.
- */
-
- int4store(cmd_buf,
[PHP-CVS] svn: /php/php-src/trunk/ext/mysqlnd/ mysqlnd_ps.c
andrey Fri, 18 Mar 2011 13:55:25 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=309384
Log:
WS
Changed paths:
U php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c 2011-03-18 13:52:52 UTC (rev
309383)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c 2011-03-18 13:55:25 UTC (rev
309384)
@@ -1305,7 +1305,6 @@
DBG_ERR(command out of sync);
DBG_RETURN(FAIL);
}
-
if (param_no = stmt-param_count) {
SET_STMT_ERROR(stmt, CR_INVALID_PARAMETER_NO, UNKNOWN_SQLSTATE,
Invalid parameter number);
DBG_ERR(invalid param_no);
@@ -1424,8 +1423,7 @@
*/
for (i = 0; i stmt-param_count; i++) {
/*
- We may have the last reference, then call
zval_ptr_dtor()
- or we may leak memory.
+ We may have the last reference, then call
zval_ptr_dtor() or we may leak memory.
Switching from bind_one_parameter to
bind_parameters may result in zv being NULL
*/
if (stmt-param_bind[i].zv) {
@@ -1918,6 +1916,7 @@
}
/* }}} */
+
/* free_result() doesn't actually free stmt-result but only the buffers */
/* {{{ mysqlnd_stmt::free_result */
static enum_func_status
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/mysqlnd/ mysqlnd.c mysqlnd_alloc.c mysqlnd_alloc.h mysqlnd_debug.c mysqlnd_net.c mysqlnd_ps.c mysqlnd_ps_codec.c
andrey Fri, 18 Mar 2011 14:56:20 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=309388
Log:
add a proxy for sppintf and vspprintf
Changed paths:
U php/php-src/trunk/ext/mysqlnd/mysqlnd.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_alloc.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_alloc.h
U php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_ps_codec.c
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2011-03-18 14:54:02 UTC (rev 309387)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2011-03-18 14:56:20 UTC (rev 309388)
@@ -524,11 +524,11 @@
{
char * plugin_name = NULL;
-spprintf(plugin_name, 0, auth_plugin_%s, requested_protocol);
+mnd_sprintf(plugin_name, 0, auth_plugin_%s, requested_protocol);
DBG_INF_FMT(looking for %s auth plugin, plugin_name);
auth_plugin = mysqlnd_plugin_find(plugin_name);
-efree(plugin_name);
+mnd_sprintf_free(plugin_name);
if (!auth_plugin) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, The server requested authentication method unknown to the client [%s], requested_protocol);
@@ -695,7 +695,7 @@
if (!socket_or_pipe) {
socket_or_pipe = /tmp/mysql.sock;
}
- transport_len = spprintf(transport, 0, unix://%s, socket_or_pipe);
+ transport_len = mnd_sprintf(transport, 0, unix://%s, socket_or_pipe);
unix_socket = TRUE;
#else
if (host_len == sizeof(.) - 1 host[0] == '.') {
@@ -703,14 +703,14 @@
if (!socket_or_pipe) {
socket_or_pipe = .\\pipe\\MySQL;
}
- transport_len = spprintf(transport, 0, pipe://%s, socket_or_pipe);
+ transport_len = mnd_sprintf(transport, 0, pipe://%s, socket_or_pipe);
named_pipe = TRUE;
#endif
} else {
if (!port) {
port = 3306;
}
- transport_len = spprintf(transport, 0, tcp://%s:%u, host, port);
+ transport_len = mnd_sprintf(transport, 0, tcp://%s:%u, host, port);
}
if (!transport) {
SET_OOM_ERROR(conn-error_info);
@@ -719,7 +719,7 @@
DBG_INF_FMT(transport=%s, transport);
conn-scheme = mnd_pestrndup(transport, transport_len, conn-persistent);
conn-scheme_len = transport_len;
- efree(transport); /* allocated by spprintf */
+ mnd_sprintf_free(transport);
transport = NULL;
if (!conn-scheme) {
goto err; /* OOM */
@@ -833,13 +833,13 @@
conn-host_len = strlen(conn-host);
{
char *p;
-spprintf(p, 0, %s via TCP/IP, conn-host);
+mnd_sprintf(p, 0, %s via TCP/IP, conn-host);
if (!p) {
SET_OOM_ERROR(conn-error_info);
goto err; /* OOM */
}
conn-host_info = mnd_pestrdup(p, conn-persistent);
-efree(p); /* allocated by spprintf */
+mnd_sprintf_free(p);
if (!conn-host_info) {
SET_OOM_ERROR(conn-error_info);
goto err; /* OOM */
@@ -851,13 +851,13 @@
conn-host_info = mnd_pestrdup(Localhost via UNIX socket, conn-persistent);
} else if (named_pipe) {
char *p;
-spprintf(p, 0, %s via named pipe, conn-unix_socket);
+mnd_sprintf(p, 0, %s via named pipe, conn-unix_socket);
if (!p) {
SET_OOM_ERROR(conn-error_info);
goto err; /* OOM */
}
conn-host_info = mnd_pestrdup(p, conn-persistent);
-efree(p); /* allocated by spprintf */
+mnd_sprintf_free(p);
if (!conn-host_info) {
SET_OOM_ERROR(conn-error_info);
goto err; /* OOM */
@@ -1317,13 +1317,13 @@
if (par1) {
if (achtung_wild) {
- show_query_len = spprintf(show_query, 0, query, par1, achtung_wild);
+ show_query_len = mnd_sprintf(show_query, 0, query, par1, achtung_wild);
} else {
- show_query_len = spprintf(show_query, 0, query, par1);
+ show_query_len = mnd_sprintf(show_query, 0, query, par1);
}
} else {
if (achtung_wild) {
- show_query_len = spprintf(show_query, 0, query, achtung_wild);
+ show_query_len = mnd_sprintf(show_query, 0, query, achtung_wild);
} else {
show_query_len = strlen(show_query = (char *)query);
}
@@ -1333,7 +1333,7 @@
result = conn-m-store_result(conn TSRMLS_CC);
}
if (show_query != query) {
- efree(show_query); /* allocated by spprintf */
+ mnd_sprintf_free(show_query);
}
DBG_RETURN(result);
}
@@ -1547,7 +1547,7 @@
DBG_RETURN(FAIL);
}
- query_len = spprintf(query, 0, SET NAMES %s, csname);
+ query_len = mnd_sprintf(query, 0, SET NAMES %s, csname);
if (FAIL == conn-m-query(conn, query, query_len TSRMLS_CC)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Error executing query);
@@ -1556,7 +1556,7 @@
} else {
conn-charset = charset;
}
- efree(query); /* allocated by spprintf */
+ mnd_sprintf_free(query);
DBG_INF(ret == PASS? PASS:FAIL);
DBG_RETURN(ret);
@@ -2033,11 +2033,11 @@
{
char * plugin_name = NULL;
-
[PHP-CVS] svn: /SVNROOT/ pear_avail
gauthiermFri, 18 Mar 2011 15:37:17 + Revision: http://svn.php.net/viewvc?view=revisionrevision=309390 Log: Add till to pearweb. Changed paths: U SVNROOT/pear_avail Modified: SVNROOT/pear_avail === --- SVNROOT/pear_avail 2011-03-18 15:13:39 UTC (rev 309389) +++ SVNROOT/pear_avail 2011-03-18 15:37:17 UTC (rev 309390) @@ -22,7 +22,7 @@ avail|cox,mj,vblavet,dickmann,tal,jmcastagnetto,alexmerz,cellog,pajoye,timj,clay,dufuz,bjori,davidc,saltybeagle,derick,sebastian|pear/pear-core # PEAR website -avail|wez,alan_k,chagenbu,cmv,cox,derick,dickmann,jon,mj,pajoye,richard,tal,antonio,alexmerz,jan,toby,draber,cellog,dufuz,danielc,lsmith,arnaud,davidc,wiesemann,jani,cweiske,saltybeagle,izi,clockwerx|pear/pearweb +avail|wez,alan_k,chagenbu,cmv,cox,derick,dickmann,jon,mj,pajoye,richard,tal,antonio,alexmerz,jan,toby,draber,cellog,dufuz,danielc,lsmith,arnaud,davidc,wiesemann,jani,cweiske,saltybeagle,izi,clockwerx,till|pear/pearweb # PEAR2 website avail|amir|till|pear2/sandbox/pear2.php.net -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/acinclude.m4 branches/PHP_5_3/ext/ldap/config.m4 branches/PHP_5_3/ext/openssl/config0.m4 trunk/acinclude.m4 trunk/ext/ldap/config.m4
geissert Fri, 18 Mar 2011 18:47:09 + Revision: http://svn.php.net/viewvc?view=revisionrevision=309398 Log: Add the libraries we actually test and need for LDAP and OpenSSL, fixes bug #53339 Patch by Clint Byrum Bug: http://bugs.php.net/53339 (Open) Fails to build LDAP module when compilng with gcc 4.5 and DSO libraries Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/acinclude.m4 U php/php-src/branches/PHP_5_3/ext/ldap/config.m4 U php/php-src/branches/PHP_5_3/ext/openssl/config0.m4 U php/php-src/trunk/acinclude.m4 U php/php-src/trunk/ext/ldap/config.m4 U php/php-src/trunk/ext/openssl/config0.m4 Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2011-03-18 17:05:46 UTC (rev 309397) +++ php/php-src/branches/PHP_5_3/NEWS 2011-03-18 18:47:09 UTC (rev 309398) @@ -13,6 +13,10 @@ - DBA extension: . Fixed bug #54242 (dba_insert returns true if key already exists). (Felipe) +- LDAP extension: + . Fixed bug #53339 (Fails to build when compilng with gcc 4.5 and DSO +libraries). (Clint Byrum, Raphael) + - MySQL Improved extension: . Fixed Bug #54221 (mysqli::get_warnings segfault when used in multi queries). (Andrey) Modified: php/php-src/branches/PHP_5_3/acinclude.m4 === --- php/php-src/branches/PHP_5_3/acinclude.m4 2011-03-18 17:05:46 UTC (rev 309397) +++ php/php-src/branches/PHP_5_3/acinclude.m4 2011-03-18 18:47:09 UTC (rev 309398) @@ -2397,7 +2397,7 @@ -L$OPENSSL_LIBDIR ]) LIBS=$old_LIBS -PHP_ADD_LIBRARY(ssl,,$1) +PHP_ADD_LIBRARY(crypto,,$1) PHP_ADD_LIBPATH($OPENSSL_LIBDIR, $1) fi Modified: php/php-src/branches/PHP_5_3/ext/ldap/config.m4 === --- php/php-src/branches/PHP_5_3/ext/ldap/config.m4 2011-03-18 17:05:46 UTC (rev 309397) +++ php/php-src/branches/PHP_5_3/ext/ldap/config.m4 2011-03-18 18:47:09 UTC (rev 309398) @@ -50,7 +50,7 @@ SASL_LIB=-L$LDAP_SASL_LIBDIR -lsasl2 fi - PHP_CHECK_LIBRARY(ldap, sasl_version, + PHP_CHECK_LIBRARY(sasl2, sasl_version, [ PHP_ADD_INCLUDE($LDAP_SASL_INCDIR) PHP_ADD_LIBRARY_WITH_PATH(sasl2, $LDAP_SASL_LIBDIR, LDAP_SHARED_LIBADD) Modified: php/php-src/branches/PHP_5_3/ext/openssl/config0.m4 === --- php/php-src/branches/PHP_5_3/ext/openssl/config0.m4 2011-03-18 17:05:46 UTC (rev 309397) +++ php/php-src/branches/PHP_5_3/ext/openssl/config0.m4 2011-03-18 18:47:09 UTC (rev 309398) @@ -17,6 +17,7 @@ fi AC_CHECK_LIB(ssl, DSA_get_default_method, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later])) + AC_CHECK_LIB(crypto, X509_free, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later])) PHP_SETUP_OPENSSL(OPENSSL_SHARED_LIBADD, [ Modified: php/php-src/trunk/acinclude.m4 === --- php/php-src/trunk/acinclude.m4 2011-03-18 17:05:46 UTC (rev 309397) +++ php/php-src/trunk/acinclude.m4 2011-03-18 18:47:09 UTC (rev 309398) @@ -2412,7 +2412,7 @@ -L$OPENSSL_LIBDIR ]) LIBS=$old_LIBS -PHP_ADD_LIBRARY(ssl,,$1) +PHP_ADD_LIBRARY(crypto,,$1) PHP_ADD_LIBPATH($OPENSSL_LIBDIR, $1) fi Modified: php/php-src/trunk/ext/ldap/config.m4 === --- php/php-src/trunk/ext/ldap/config.m42011-03-18 17:05:46 UTC (rev 309397) +++ php/php-src/trunk/ext/ldap/config.m42011-03-18 18:47:09 UTC (rev 309398) @@ -50,7 +50,7 @@ SASL_LIB=-L$LDAP_SASL_LIBDIR -lsasl2 fi - PHP_CHECK_LIBRARY(ldap, sasl_version, + PHP_CHECK_LIBRARY(sasl2, sasl_version, [ PHP_ADD_INCLUDE($LDAP_SASL_INCDIR) PHP_ADD_LIBRARY_WITH_PATH(sasl2, $LDAP_SASL_LIBDIR, LDAP_SHARED_LIBADD) Modified: php/php-src/trunk/ext/openssl/config0.m4 === --- php/php-src/trunk/ext/openssl/config0.m42011-03-18 17:05:46 UTC (rev 309397) +++ php/php-src/trunk/ext/openssl/config0.m42011-03-18 18:47:09 UTC (rev 309398) @@ -17,6 +17,7 @@ fi AC_CHECK_LIB(ssl, DSA_get_default_method, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later])) + AC_CHECK_LIB(crypto, X509_free, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later])) PHP_SETUP_OPENSSL(OPENSSL_SHARED_LIBADD, [ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
