[PHP-CVS] cvs: php-src /ext/ircg php_ircg_formats.h
sas Tue Jul 8 02:04:30 2003 EDT Modified files: /php-src/ext/ircg php_ircg_formats.h Log: whitespace Index: php-src/ext/ircg/php_ircg_formats.h diff -u php-src/ext/ircg/php_ircg_formats.h:1.3 php-src/ext/ircg/php_ircg_formats.h:1.4 --- php-src/ext/ircg/php_ircg_formats.h:1.3 Mon Jul 7 11:45:43 2003 +++ php-src/ext/ircg/php_ircg_formats.h Tue Jul 8 02:04:30 2003 @@ -35,11 +35,11 @@ FMT_MSG_NOTICE_CHAN, FMT_MSG_NOTICE_TO_ME, FMT_MSG_NOTICE_FROM_ME, -FMT_MSG_LUSERCLIENT, -FMT_MSG_LUSEROP, -FMT_MSG_LUSERUNKNOWN, -FMT_MSG_LUSERCHANNELS, -FMT_MSG_LUSERME, + FMT_MSG_LUSERCLIENT, + FMT_MSG_LUSEROP, + FMT_MSG_LUSERUNKNOWN, + FMT_MSG_LUSERCHANNELS, + FMT_MSG_LUSERME, NO_FMTS }; /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/mcve mcve.c php_mcve.h
On Tue, 8 Jul 2003, Brad House wrote: bradmssw Mon Jul 7 23:16:38 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/mcve mcve.c php_mcve.h Log: update mcve ext from HEAD. Sync with libmcve-3.2 functionality Our policy is to put no new functionality in stable branches, can you explain why this is necessary? regards, Derick -- Interpreting what the GPL actually means is a job best left to those that read the future by examining animal entrails. - Derick Rethans http://derickrethans.nl/ International PHP Magazine http://php-mag.net/ - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/com COM.c
wez Tue Jul 8 05:10:42 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/comCOM.c
Log:
Fix leak when loading constants from a type-library.
Index: php-src/ext/com/COM.c
diff -u php-src/ext/com/COM.c:1.90.2.7 php-src/ext/com/COM.c:1.90.2.8
--- php-src/ext/com/COM.c:1.90.2.7 Fri May 16 15:20:18 2003
+++ php-src/ext/com/COM.c Tue Jul 8 05:10:42 2003
@@ -18,7 +18,7 @@
| Wez Furlong [EMAIL PROTECTED] |
+--+
*/
-/* $Id: COM.c,v 1.90.2.7 2003/05/16 19:20:18 wez Exp $ */
+/* $Id: COM.c,v 1.90.2.8 2003/07/08 09:10:42 wez Exp $ */
/*
* This module implements support for COM components that support the IDispatch
* interface. Both local (COM) and remote (DCOM) components can be accessed.
@@ -55,7 +55,7 @@
#ifdef PHP_WIN32
#define _WIN32_DCOM
-
+#define COBJMACROS
#include iostream.h
#include math.h
#include ocidl.h
@@ -2224,7 +2224,6 @@
PHPAPI int php_COM_load_typelib(ITypeLib *TypeLib, int mode TSRMLS_DC)
{
- ITypeComp *TypeComp;
int i;
int interfaces;
@@ -2232,40 +2231,33 @@
return FAILURE;
}
- interfaces = TypeLib-lpVtbl-GetTypeInfoCount(TypeLib);
+ interfaces = ITypeLib_GetTypeInfoCount(TypeLib);
- TypeLib-lpVtbl-GetTypeComp(TypeLib, TypeComp);
for (i=0; iinterfaces; i++) {
TYPEKIND pTKind;
- TypeLib-lpVtbl-GetTypeInfoType(TypeLib, i, pTKind);
- if (pTKind==TKIND_ENUM) {
+ ITypeLib_GetTypeInfoType(TypeLib, i, pTKind);
+ if (pTKind == TKIND_ENUM) {
ITypeInfo *TypeInfo;
VARDESC *pVarDesc;
UINT NameCount;
int j;
-#if 0
- BSTR bstr_EnumId;
- char *EnumId;
-
- TypeLib-lpVtbl-GetDocumentation(TypeLib, i, bstr_EnumId,
NULL, NULL, NULL);
- EnumId = php_OLECHAR_to_char(bstr_EnumId, NULL, codepage);
- printf(Enumeration %d - %s:\n, i, EnumId);
- efree(EnumId);
-#endif
- TypeLib-lpVtbl-GetTypeInfo(TypeLib, i, TypeInfo);
+ ITypeLib_GetTypeInfo(TypeLib, i, TypeInfo);
- j=0;
- while (SUCCEEDED(TypeInfo-lpVtbl-GetVarDesc(TypeInfo, j,
pVarDesc))) {
+ for (j = 0; ; j++) {
BSTR bstr_ids;
zend_constant c;
zval exists, results, value;
char *const_name;
- TypeInfo-lpVtbl-GetNames(TypeInfo, pVarDesc-memid,
bstr_ids, 1, NameCount);
- if (NameCount!=1) {
- j++;
+ if (FAILED(ITypeInfo_GetVarDesc(TypeInfo, j,
pVarDesc))) {
+ break;
+ }
+
+ ITypeInfo_GetNames(TypeInfo, pVarDesc-memid,
bstr_ids, 1, NameCount);
+ if (NameCount != 1) {
+ ITypeInfo_ReleaseVarDesc(TypeInfo, pVarDesc);
continue;
}
const_name = php_OLECHAR_to_char(bstr_ids,
c.name_len, codepage TSRMLS_CC);
@@ -2282,7 +2274,7 @@
php_error(E_WARNING, %s(): Type
library value %s is already defined and has a different value,
get_active_function_name(TSRMLS_C), c.name);
}
free(c.name);
- j++;
+ ITypeInfo_ReleaseVarDesc(TypeInfo, pVarDesc);
continue;
}
@@ -2296,10 +2288,9 @@
zend_register_constant(c TSRMLS_CC);
}
-
- j++;
+ ITypeInfo_ReleaseVarDesc(TypeInfo, pVarDesc);
}
- TypeInfo-lpVtbl-Release(TypeInfo);
+ ITypeInfo_Release(TypeInfo);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / EXTENSIONS
wez Tue Jul 8 05:12:00 2003 EDT Modified files: (Branch: PHP_4_3) /php-srcEXTENSIONS Log: update activescript info Index: php-src/EXTENSIONS diff -u php-src/EXTENSIONS:1.51.2.2 php-src/EXTENSIONS:1.51.2.3 --- php-src/EXTENSIONS:1.51.2.2 Mon Jul 7 18:51:16 2003 +++ php-src/EXTENSIONS Tue Jul 8 05:12:00 2003 @@ -32,8 +32,9 @@ STATUS: Unknown --- EXTENSION: activescript -MAINTENANCE: Unknown -STATUS: Unknown +PRIMARY MAINTAINER: Wez Furlong [EMAIL PROTECTED] +MAINTENANCE: Odd Fixes +STATUS: Experimental --- EXTENSION: apache PRIMARY MAINTAINER: Rasmus Lerdorf [EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / EXTENSIONS
wez Tue Jul 8 05:13:05 2003 EDT Modified files: /php-srcEXTENSIONS Log: MFB extensions info Index: php-src/EXTENSIONS diff -u php-src/EXTENSIONS:1.56 php-src/EXTENSIONS:1.57 --- php-src/EXTENSIONS:1.56 Mon Jul 7 18:36:31 2003 +++ php-src/EXTENSIONS Tue Jul 8 05:13:05 2003 @@ -32,8 +32,9 @@ STATUS: Unknown --- EXTENSION: activescript -MAINTENANCE: Unknown -STATUS: Unknown +PRIMARY MAINTAINER: Wez Furlong [EMAIL PROTECTED] +MAINTENANCE: Odd Fixes +STATUS: Experimental --- EXTENSION: apache PRIMARY MAINTAINER: Rasmus Lerdorf [EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / README.SUBMITTING_PATCH
derick Tue Jul 8 05:43:39 2003 EDT Modified files: /php-srcREADME.SUBMITTING_PATCH Log: - Fixed email address Index: php-src/README.SUBMITTING_PATCH diff -u php-src/README.SUBMITTING_PATCH:1.6 php-src/README.SUBMITTING_PATCH:1.7 --- php-src/README.SUBMITTING_PATCH:1.6 Thu Nov 14 15:57:48 2002 +++ php-src/README.SUBMITTING_PATCH Tue Jul 8 05:43:39 2003 @@ -37,7 +37,7 @@ too hard to review. If you would like change/add many lines, it is better to ask module -maintainer and/or [EMAIL PROTECTED], or [EMAIL PROTECTED] if +maintainer and/or [EMAIL PROTECTED], or [EMAIL PROTECTED] if you are patching PEAR. Official module maintainers can be found in EXTENSIONS file in PHP source. @@ -79,7 +79,7 @@ Where to send your patch? - -If you are patching C source, send the patch to [EMAIL PROTECTED] +If you are patching C source, send the patch to [EMAIL PROTECTED] If you are patching a module, you should also send the patch to the maintainer. Official module maintainers are listed in EXTENSION file in source. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / README.SUBMITTING_PATCH
derick Tue Jul 8 05:44:35 2003 EDT Modified files: (Branch: PHP_4_3) /php-srcREADME.SUBMITTING_PATCH Log: - MFH: Fixed email addresses Index: php-src/README.SUBMITTING_PATCH diff -u php-src/README.SUBMITTING_PATCH:1.4.2.2 php-src/README.SUBMITTING_PATCH:1.4.2.3 --- php-src/README.SUBMITTING_PATCH:1.4.2.2 Thu Jun 12 09:56:03 2003 +++ php-src/README.SUBMITTING_PATCH Tue Jul 8 05:44:34 2003 @@ -37,7 +37,7 @@ too hard to review. If you would like change/add many lines, it is better to ask module -maintainer and/or [EMAIL PROTECTED], or [EMAIL PROTECTED] if +maintainer and/or [EMAIL PROTECTED], or [EMAIL PROTECTED] if you are patching PEAR. Official module maintainers can be found in EXTENSIONS file in PHP source. @@ -79,7 +79,7 @@ Where to send your patch? - -If you are patching C source, send the patch to [EMAIL PROTECTED] +If you are patching C source, send the patch to [EMAIL PROTECTED] If you are patching a module, you should also send the patch to the maintainer. Official module maintainers are listed in EXTENSION file in source. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/mcve mcve.c php_mcve.h
The functionality is not experimental. It has been in our private stable branch for quite some time, and we had just not merged it into the tree. We've actually had quite a few requests from people to merge it into the next official release so they could update php via the FreeBSD ports system or whatnot without having to apply our patches, and compile by hand. You should notice that very little had actually changed. It simply added a lot of Constants, and added one function mcve_setssl_files. I see no reason not to update the branch, especially since the changes are really non-intrusive. I can back it out if necessary, as I don't want to adversely affect any policy you may have. -Brad Derick Rethans wrote: On Tue, 8 Jul 2003, Brad House wrote: bradmssw Mon Jul 7 23:16:38 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/mcve mcve.c php_mcve.h Log: update mcve ext from HEAD. Sync with libmcve-3.2 functionality Our policy is to put no new functionality in stable branches, can you explain why this is necessary? regards, Derick -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/sockets sockets.c
This is correct.
-Jason
On Mon, 2003-07-07 at 19:51, Jani Taskinen wrote:
And you're sure getaddrinfo() is always available (whenever IPV6 is) ??
--Jani
On Mon, 7 Jul 2003, Sara Golemon wrote:
pollita Mon Jul 7 18:27:32 2003 EDT
Modified files:
/php-src/ext/sockets sockets.c
Log:
Fix non-GNU build. Use getaddrinfo() rather than gethostbyname2()
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.143 php-src/ext/sockets/sockets.c:1.144
--- php-src/ext/sockets/sockets.c:1.143 Tue Jun 17 00:44:30 2003
+++ php-src/ext/sockets/sockets.cMon Jul 7 18:27:32 2003
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: sockets.c,v 1.143 2003/06/17 04:44:30 sterling Exp $ */
+/* $Id: sockets.c,v 1.144 2003/07/07 22:27:32 pollita Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -378,12 +378,16 @@
static int php_set_inet6_addr(struct sockaddr_in6 *sin6, char *string, php_socket
*php_sock TSRMLS_DC)
{
struct in6_addr tmp;
-struct hostent *host_entry;
+struct addrinfo hints;
+struct addrinfo *addrinfo = NULL;
if (inet_pton(AF_INET6, string, tmp)) {
memcpy((sin6-sin6_addr.s6_addr), (tmp.s6_addr), sizeof(struct
in6_addr));
} else {
-if (! (host_entry = gethostbyname2(string, AF_INET6))) {
+memset(hints, 0, sizeof(struct addrinfo));
+hints.ai_family = PF_INET6;
+getaddrinfo(string, NULL, hints, addrinfo);
+if (!addrinfo) {
#ifdef PHP_WIN32
PHP_SOCKET_ERROR(php_sock, Host lookup failed,
WSAGetLastError());
#else
@@ -391,11 +395,14 @@
#endif
return 0;
}
-if (host_entry-h_addrtype != AF_INET6) {
+if (addrinfo-ai_family != PF_INET6 || addrinfo-ai_addrlen !=
sizeof(struct sockaddr_in6)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Host lookup
failed: Non AF_INET6 domain returned on AF_INET6 socket);
+freeaddrinfo(addrinfo);
return 0;
}
-memcpy((sin6-sin6_addr.s6_addr), host_entry-h_addr_list[0],
host_entry-h_length);
+
+memcpy((sin6-sin6_addr.s6_addr), ((struct
sockaddr_in6*)(addrinfo-ai_addr))-sin6_addr.s6_addr, sizeof(struct in6_addr));
+freeaddrinfo(addrinfo);
}
return 1;
--
https://www.paypal.com/xclick/[EMAIL PROTECTED]no_note=1tax=0currency_code=EUR
--
Jason Greene [EMAIL PROTECTED]
[EMAIL PROTECTED]
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/sockets sockets.c
On Tue, 2003-07-08 at 08:15, Sascha Schumann wrote: On Tue, 8 Jul 2003, Jason Greene wrote: If the platform supports gethostbyname_r(most i know do), that is thread safe. Note the 2 in the name. - Sascha I should have been more specific, we should change the ipv4 resolver code in sockets to use either getaddrinfo or gethostbyname_r, as it is currently not thread safe. The Ipv6 resolver code should just always use getaddrinfo -Jason -- Jason Greene [EMAIL PROTECTED] [EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mnogosearch php_mnogo.c
gluke Tue Jul 8 09:27:29 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mnogosearchphp_mnogo.c
Log:
- Udm_Find function is fixed to be compatible with mnogosearch-3.2.13
Index: php-src/ext/mnogosearch/php_mnogo.c
diff -u php-src/ext/mnogosearch/php_mnogo.c:1.66.2.3
php-src/ext/mnogosearch/php_mnogo.c:1.66.2.4
--- php-src/ext/mnogosearch/php_mnogo.c:1.66.2.3Mon Jun 30 13:44:19 2003
+++ php-src/ext/mnogosearch/php_mnogo.c Tue Jul 8 09:27:29 2003
@@ -1,5 +1,5 @@
/* $Source: /usr/repository/php-src/ext/mnogosearch/php_mnogo.c,v $ */
-/* $Id: php_mnogo.c,v 1.66.2.3 2003/06/30 17:44:19 gluke Exp $ */
+/* $Id: php_mnogo.c,v 1.66.2.4 2003/07/08 13:27:29 gluke Exp $ */
/*
+--+
@@ -7,10 +7,10 @@
+--+
| Copyright (c) 1997-2003 The PHP Group|
+--+
- | This source file is subject to version 2.02 of the PHP license, |
+ | This source file is subject to version 3.0 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is|
- | available at through the world-wide-web at |
- | http://www.php.net/license/2_02.txt. |
+ | available through the world-wide-web at the following url: |
+ | http://www.php.net/license/3_0.txt. |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| [EMAIL PROTECTED] so we can mail you a copy immediately. |
@@ -1883,6 +1883,14 @@
int id=-1;
switch(ZEND_NUM_ARGS()){
+#if UDM_VERSION_ID = 30213
+ case 1: {
+ if (zend_get_parameters_ex(1, yyagent)==FAILURE) {
+ RETURN_FALSE;
+ }
+ }
+ break;
+#endif
case 2: {
if (zend_get_parameters_ex(2,
yyagent,yyquery)==FAILURE) {
RETURN_FALSE;
@@ -1899,7 +1907,11 @@
#if UDM_VERSION_ID 30200
if ((Res=UdmFind(Agent,UdmTolower(Z_STRVAL_PP(yyquery),Agent-charset {
#else
+#if UDM_VERSION_ID = 30213
+ if ((Res=UdmFind(Agent))) {
+#else
if ((Res=UdmFind(Agent,Z_STRVAL_PP(yyquery {
+#endif
#endif
ZEND_REGISTER_RESOURCE(return_value,Res,le_res);
} else {
@@ -2381,7 +2393,6 @@
add_next_index_stringl(return_value,
C.Category[i].name,strlen(C.Category[i].name),1);
}
} else {
- free(buf);
RETURN_FALSE;
}
}
@@ -2456,7 +2467,6 @@
add_next_index_stringl(return_value,
C.Category[i].name,strlen(C.Category[i].name),1);
}
} else {
- free(buf);
RETURN_FALSE;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mnogosearch php_mnogo.c
gluke Tue Jul 8 09:28:16 2003 EDT
Modified files:
/php-src/ext/mnogosearchphp_mnogo.c
Log:
- Udm_Find function is fixed to be compatible with mnogosearch-3.2.13
Index: php-src/ext/mnogosearch/php_mnogo.c
diff -u php-src/ext/mnogosearch/php_mnogo.c:1.76
php-src/ext/mnogosearch/php_mnogo.c:1.77
--- php-src/ext/mnogosearch/php_mnogo.c:1.76Mon Jun 30 13:12:17 2003
+++ php-src/ext/mnogosearch/php_mnogo.c Tue Jul 8 09:28:16 2003
@@ -1,5 +1,5 @@
/* $Source: /usr/repository/php-src/ext/mnogosearch/php_mnogo.c,v $ */
-/* $Id: php_mnogo.c,v 1.76 2003/06/30 17:12:17 gluke Exp $ */
+/* $Id: php_mnogo.c,v 1.77 2003/07/08 13:28:16 gluke Exp $ */
/*
+--+
@@ -439,7 +439,7 @@
return res;
}
-/* {{{ proto resource udm_alloc_agent(string dbaddr [, string dbmode])
+/* {{{ proto int udm_alloc_agent(string dbaddr [, string dbmode])
Allocate mnoGoSearch session */
DLEXPORT PHP_FUNCTION(udm_alloc_agent)
{
@@ -561,7 +561,7 @@
}
/* }}} */
-/* {{{ proto bool udm_set_agent_param(resource agent, int var, string val)
+/* {{{ proto int udm_set_agent_param(int agent, int var, string val)
Set mnoGoSearch agent session parameters */
DLEXPORT PHP_FUNCTION(udm_set_agent_param)
{
@@ -1092,7 +1092,7 @@
}
/* }}} */
-/* {{{ proto bool udm_load_ispell_data(resource agent, int var, string val1 [, string
charset], string val2, int flag)
+/* {{{ proto int udm_load_ispell_data(int agent, int var, string val1, [string
charset], string val2, int flag)
Load ispell data */
DLEXPORT PHP_FUNCTION(udm_load_ispell_data)
{
@@ -1235,7 +1235,7 @@
}
/* }}} */
-/* {{{ proto bool udm_free_ispell_data(resource agent)
+/* {{{ proto int udm_free_ispell_data(int agent)
Free memory allocated for ispell data */
DLEXPORT PHP_FUNCTION(udm_free_ispell_data)
{
@@ -1265,7 +1265,7 @@
}
/* }}} */
-/* {{{ proto bool udm_add_search_limit(resource agent, int var, string val)
+/* {{{ proto int udm_add_search_limit(int agent, int var, string val)
Add mnoGoSearch search restrictions */
DLEXPORT PHP_FUNCTION(udm_add_search_limit)
{
@@ -1364,7 +1364,7 @@
}
/* }}} */
-/* {{{ proto bool udm_clear_search_limits(resource agent)
+/* {{{ proto int udm_clear_search_limits(int agent)
Clear all mnoGoSearch search restrictions */
DLEXPORT PHP_FUNCTION(udm_clear_search_limits)
{
@@ -1403,7 +1403,7 @@
/* }}} */
#if UDM_VERSION_ID = 30200
-/* {{{ proto bool udm_check_charset(resource agent, string charset)
+/* {{{ proto int udm_check_charset(int agent, string charset)
Check if the given charset is known to mnogosearch */
DLEXPORT PHP_FUNCTION(udm_check_charset)
{
@@ -1436,7 +1436,7 @@
#endif
#if UDM_VERSION_ID = 30203
-/* {{{ proto string udm_crc32(resource agent, string str)
+/* {{{ proto int udm_crc32(int agent, string str)
Return CRC32 checksum of gived string */
DLEXPORT PHP_FUNCTION(udm_crc32)
{
@@ -1482,7 +1482,7 @@
}
-/* {{{ proto int udm_open_stored(resource agent, string storedaddr)
+/* {{{ proto int udm_open_stored(int agent, string storedaddr)
Open connection to stored */
DLEXPORT PHP_FUNCTION(udm_open_stored)
{
@@ -1523,7 +1523,7 @@
}
/* }}} */
-/* {{{ proto bool udm_close_stored(resource agent, int link)
+/* {{{ proto int udm_close_stored(int agent, int link)
Open connection to stored */
DLEXPORT PHP_FUNCTION(udm_close_stored)
{
@@ -1559,7 +1559,7 @@
}
/* }}} */
-/* {{{ proto int udm_check_stored(resource agent, int link, string doc_id)
+/* {{{ proto int udm_check_stored(int agent, int link, string doc_id)
Open connection to stored */
DLEXPORT PHP_FUNCTION(udm_check_stored)
{
@@ -1601,7 +1601,7 @@
#endif
#if UDM_VERSION_ID = 30204
-/* {{{ proto bool udm_parse_query_string(resource agent, string str)
+/* {{{ proto int udm_parse_query_string(int agent, string str)
Parses query string, initialises variables and search limits taken from it */
DLEXPORT PHP_FUNCTION(udm_parse_query_string)
{
@@ -1630,7 +1630,7 @@
}
/* }}} */
-/* {{{ proto bool udm_make_excerpt(resource agent, resource res, int row)
+/* {{{ proto int udm_make_excerpt(int agent, int res, int row)
Perform search */
DLEXPORT PHP_FUNCTION(udm_make_excerpt)
{
@@ -1686,7 +1686,7 @@
}
/* }}} */
-/* {{{ proto bool udm_set_agent_param_ex(resource agent, string var, string val)
+/* {{{ proto int udm_set_agent_param_ex(int agent, string var, string val)
Set mnoGoSearch agent session parameters extended */
DLEXPORT PHP_FUNCTION(udm_set_agent_param_ex)
{
@@ -1744,7 +1744,7 @@
RETURN_TRUE;
}
-/* {{{ proto string udm_get_res_field_ex(resource res, int row, string field)
+/* {{{ proto string udm_get_res_field_ex(int res, int row, string field)
Fetch mnoGoSearch result field */
DLEXPORT PHP_FUNCTION(udm_get_res_field_ex)
{
@@ -1788,7 +1788,7 @@
#endif
#if UDM_VERSION_ID = 30211
-/* {{{ proto resource udm_alloc_agent_array(array dbaddr)
+/* {{{
Re: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/ircg ircg.c php_ircg.h
On Tue, 8 Jul 2003, Zeev Suraski wrote: Judging by the complete silence, looks like you have lazy consensus! :) You two would really make for a good pair. :) - Sascha -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/ircg ircg.c php_ircg.h
At 16:31 08/07/2003, Sascha Schumann wrote: On Tue, 8 Jul 2003, Zeev Suraski wrote: Judging by the complete silence, looks like you have lazy consensus! :) You two would really make for a good pair. :) Nah, not enough contrast. I'd go for you and Jani :) Zeev -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache2filter config.m4 /sapi/apache2handler config.m4
sniper Tue Jul 8 09:53:34 2003 EDT Modified files: /php-src/sapi/apache2filter config.m4 /php-src/sapi/apache2handlerconfig.m4 Log: - Fixed bug #24537 (apache2 compile missing include directories) Index: php-src/sapi/apache2filter/config.m4 diff -u php-src/sapi/apache2filter/config.m4:1.32 php-src/sapi/apache2filter/config.m4:1.33 --- php-src/sapi/apache2filter/config.m4:1.32 Wed May 28 10:11:21 2003 +++ php-src/sapi/apache2filter/config.m4Tue Jul 8 09:53:34 2003 @@ -1,8 +1,8 @@ dnl -dnl $Id: config.m4,v 1.32 2003/05/28 14:11:21 sniper Exp $ +dnl $Id: config.m4,v 1.33 2003/07/08 13:53:34 sniper Exp $ dnl -AC_MSG_CHECKING(for Apache 2.0 module support via DSO through APXS) +AC_MSG_CHECKING(for Apache 2.0 filter-module support via DSO through APXS) AC_ARG_WITH(apxs2filter, [ --with-apxs2filter[=FILE] EXPERIMENTAL: Build shared Apache 2.0 module. FILE is the optional pathname to the Apache apxs tool; defaults to apxs.],[ @@ -32,22 +32,28 @@ fi APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR` + APXS_BINDIR=`$APXS -q BINDIR` APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET` APXS_CFLAGS=`$APXS -q CFLAGS` APXS_MPM=`$APXS -q MPM_NAME` + APU_INCLUDEDIR=`$APXS_BINDIR/apu-config --includes` + APR_INCLUDEDIR=`$APXS_BINDIR/apr-config --includes` + for flag in $APXS_CFLAGS; do case $flag in --D*) CPPFLAGS=$CPPFLAGS $flag;; +-D*) APACHE_CPPFLAGS=$APACHE_CPPFLAGS $flag;; esac done + APACHE_CFLAGS=$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APU_INCLUDEDIR $APR_INCLUDEDIR + # Test that we're trying to configure with apache 2.x PHP_AP_EXTRACT_VERSION($APXS_HTTPD) if test $APACHE_VERSION -le 200; then AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)]) - elif test $APACHE_VERSION -lt 240; then -AC_MSG_ERROR([Please note that Apache version = 2.0.40 is required.]) + elif test $APACHE_VERSION -lt 244; then +AC_MSG_ERROR([Please note that Apache version = 2.0.44 is required.]) fi APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` @@ -67,7 +73,7 @@ case $host_alias in *aix*) EXTRA_LDFLAGS=$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp -PHP_SELECT_SAPI(apache2filter, shared, sapi_apache2.c apache_config.c php_functions.c) +PHP_SELECT_SAPI(apache2filter, shared, sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) INSTALL_IT=$INSTALL_IT $SAPI_LIBTOOL ;; *darwin*) @@ -75,43 +81,40 @@ dnl the linker does not recursively look at the bundle loader and dnl pull in its dependencies. Therefore, we must pull in the APR dnl and APR-util libraries. -APXS_BINDIR=`$APXS -q BINDIR` -if test -f $APXS_BINDIR/apr-config; then +if test -x $APXS_BINDIR/apr-config; then MH_BUNDLE_FLAGS=`$APXS_BINDIR/apr-config --ldflags --link-ld --libs` fi -if test -f $APXS_BINDIR/apu-config; then +if test -x $APXS_BINDIR/apu-config; then MH_BUNDLE_FLAGS=`$APXS_BINDIR/apu-config --ldflags --link-ld --libs` $MH_BUNDLE_FLAGS fi MH_BUNDLE_FLAGS=-bundle -bundle_loader $APXS_HTTPD $MH_BUNDLE_FLAGS PHP_SUBST(MH_BUNDLE_FLAGS) -PHP_SELECT_SAPI(apache2filter, bundle, sapi_apache2.c apache_config.c php_functions.c) +PHP_SELECT_SAPI(apache2filter, bundle, sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) SAPI_SHARED=libs/libphp5.so INSTALL_IT=$INSTALL_IT $SAPI_SHARED ;; *beos*) -APXS_BINDIR=`$APXS -q BINDIR` if test -f _APP_; then `rm _APP_`; fi `ln -s $APXS_BINDIR/httpd _APP_` EXTRA_LIBS=$EXTRA_LIBS _APP_ -PHP_SELECT_SAPI(apache2filter, shared, sapi_apache2.c apache_config.c php_functions.c) +PHP_SELECT_SAPI(apache2filter, shared, sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) INSTALL_IT=$INSTALL_IT $SAPI_LIBTOOL ;; *) -PHP_SELECT_SAPI(apache2filter, shared, sapi_apache2.c apache_config.c php_functions.c) +PHP_SELECT_SAPI(apache2filter, shared, sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) INSTALL_IT=$INSTALL_IT $SAPI_LIBTOOL ;; esac - PHP_ADD_INCLUDE($APXS_INCLUDEDIR) if test $APXS_MPM != prefork; then PHP_BUILD_THREAD_SAFE fi AC_MSG_RESULT(yes) + + PHP_SUBST(APXS) ],[ AC_MSG_RESULT(no) ]) - -PHP_SUBST(APXS) dnl ## Local Variables: dnl ## tab-width: 4 Index: php-src/sapi/apache2handler/config.m4 diff -u php-src/sapi/apache2handler/config.m4:1.6 php-src/sapi/apache2handler/config.m4:1.7 --- php-src/sapi/apache2handler/config.m4:1.6 Wed May 28 10:11:21 2003 +++ php-src/sapi/apache2handler/config.m4 Tue Jul 8 09:53:34 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.6 2003/05/28 14:11:21 sniper Exp $ +dnl $Id: config.m4,v 1.7 2003/07/08 13:53:34 sniper Exp $ dnl AC_MSG_CHECKING(for Apache
Re: [PHP-CVS] cvs: php-src /ext/sockets sockets.c
FYI: gethostbyname() is thread-safe under win32. I have some code hanging around in my libwstreams repository that implements getaddrinfo() using all the possible variations of gethostbyname() or gethostbyname_r() (there are 3 possible prototypes accepting 3, 5 or 6 parameters respectively!) for IPV4 only systems. I will be merging it into PHP once I've tidied it up fully, and it should make for some nice readable resolving code at last. --Wez. - Original Message - From: Jason Greene [EMAIL PROTECTED] To: Sascha Schumann [EMAIL PROTECTED] Cc: Sara Golemon [EMAIL PROTECTED]; [EMAIL PROTECTED] Sent: Tuesday, July 08, 2003 2:22 PM Subject: Re: [PHP-CVS] cvs: php-src /ext/sockets sockets.c On Tue, 2003-07-08 at 08:15, Sascha Schumann wrote: On Tue, 8 Jul 2003, Jason Greene wrote: If the platform supports gethostbyname_r(most i know do), that is thread safe. Note the 2 in the name. - Sascha I should have been more specific, we should change the ipv4 resolver code in sockets to use either getaddrinfo or gethostbyname_r, as it is currently not thread safe. The Ipv6 resolver code should just always use getaddrinfo -Jason -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mnogosearch php_mnogo.c
gluke Tue Jul 8 10:00:19 2003 EDT
Modified files:
/php-src/ext/mnogosearchphp_mnogo.c
Log:
- Output of UDM_PARAM_WORDINFO_ALL was fixed
Index: php-src/ext/mnogosearch/php_mnogo.c
diff -u php-src/ext/mnogosearch/php_mnogo.c:1.77
php-src/ext/mnogosearch/php_mnogo.c:1.78
--- php-src/ext/mnogosearch/php_mnogo.c:1.77Tue Jul 8 09:28:16 2003
+++ php-src/ext/mnogosearch/php_mnogo.c Tue Jul 8 10:00:19 2003
@@ -1,5 +1,5 @@
/* $Source: /usr/repository/php-src/ext/mnogosearch/php_mnogo.c,v $ */
-/* $Id: php_mnogo.c,v 1.77 2003/07/08 13:28:16 gluke Exp $ */
+/* $Id: php_mnogo.c,v 1.78 2003/07/08 14:00:19 gluke Exp $ */
/*
+--+
@@ -2148,8 +2148,9 @@
*wordinfo = '\0';
for(i = 0; i Res-WWList.nwords; i++){
- if ((Res-WWList.Word[i].count 0) ||
(Res-WWList.Word[i].origin == UDM_WORD_ORIGIN_QUERY)) {
- if(wordinfo[0]) strcat(wordinfo,, );
+ if ((Res-WWList.Word[i].count 0) ||
+ (Res-WWList.Word[i].origin ==
UDM_WORD_ORIGIN_QUERY)) {
+ if(wordinfo[0]) strcat(wordinfo,, );
sprintf(UDM_STREND(wordinfo), %s : %d,
Res-WWList.Word[i].word, Res-WWList.Word[i].count);
} else if (Res-WWList.Word[i].origin ==
UDM_WORD_ORIGIN_STOP) {
if(wordinfo[0]) strcat(wordinfo,, );
@@ -2167,7 +2168,7 @@
#if UDM_VERSION_ID = 30204
case UDM_PARAM_WORDINFO_ALL:
{
- int len,i;
+ int len,i,j;
for(len = i = 0; i Res-WWList.nwords; i++)
len += Res-WWList.Word[i].len;
{
@@ -2177,23 +2178,19 @@
*wordinfo = '\0';
- for(i = 0; i Res-WWList.nwords; i++){
- if (Res-WWList.Word[i].order != corder) {
- if(wordinfo[0]) {
- sprintf(UDM_STREND(wordinfo), / %d, ,
ccount);
- }
- ccount = Res-WWList.Word[i].count;
- if (Res-WWList.Word[i].origin ==
UDM_WORD_ORIGIN_STOP) {
- sprintf(UDM_STREND(wordinfo), %s :
stopword, Res-WWList.Word[i].word);
- } else {
- sprintf(UDM_STREND(wordinfo), %s : %d,
Res-WWList.Word[i].word, Res-WWList.Word[i].count);
- corder = Res-WWList.Word[i].order;
- }
- } else {
- ccount += Res-WWList.Word[i].count;
+ for(i = 0; i Res-WWList.nwords; i++) {
+ corder = Res-WWList.Word[i].order;
+ ccount = 0;
+ for(j = 0; j Res-WWList.nwords; j++) {
+ if (Res-WWList.Word[j].order == corder) {
+ ccount += Res-WWList.Word[j].count;
+ }
}
- }
- if (Res-WWList.nwords) {
+ if (Res-WWList.Word[i].origin ==
UDM_WORD_ORIGIN_STOP) {
+ sprintf(UDM_STREND(wordinfo),%s%s :
stopword, (*wordinfo) ? , : , Res-WWList.Word[i].word);
+ } else if (Res-WWList.Word[i].origin ==
UDM_WORD_ORIGIN_QUERY) {
+ sprintf(UDM_STREND(wordinfo),%s%s : %d,
(*wordinfo) ? , : , Res-WWList.Word[i].word, Res-WWList.Word[i].count);
+ } else continue;
sprintf(UDM_STREND(wordinfo), / %d, ccount);
}
RETURN_STRING(wordinfo,1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mnogosearch php_mnogo.c
gluke Tue Jul 8 10:00:57 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mnogosearchphp_mnogo.c
Log:
- Output of UDM_PARAM_WORDINFO_ALL was fixed
Index: php-src/ext/mnogosearch/php_mnogo.c
diff -u php-src/ext/mnogosearch/php_mnogo.c:1.66.2.4
php-src/ext/mnogosearch/php_mnogo.c:1.66.2.5
--- php-src/ext/mnogosearch/php_mnogo.c:1.66.2.4Tue Jul 8 09:27:29 2003
+++ php-src/ext/mnogosearch/php_mnogo.c Tue Jul 8 10:00:57 2003
@@ -1,5 +1,5 @@
/* $Source: /usr/repository/php-src/ext/mnogosearch/php_mnogo.c,v $ */
-/* $Id: php_mnogo.c,v 1.66.2.4 2003/07/08 13:27:29 gluke Exp $ */
+/* $Id: php_mnogo.c,v 1.66.2.5 2003/07/08 14:00:57 gluke Exp $ */
/*
+--+
@@ -2148,8 +2148,9 @@
*wordinfo = '\0';
for(i = 0; i Res-WWList.nwords; i++){
- if ((Res-WWList.Word[i].count 0) ||
(Res-WWList.Word[i].origin == UDM_WORD_ORIGIN_QUERY)) {
- if(wordinfo[0]) strcat(wordinfo,, );
+ if ((Res-WWList.Word[i].count 0) ||
+ (Res-WWList.Word[i].origin ==
UDM_WORD_ORIGIN_QUERY)) {
+ if(wordinfo[0]) strcat(wordinfo,, );
sprintf(UDM_STREND(wordinfo), %s : %d,
Res-WWList.Word[i].word, Res-WWList.Word[i].count);
} else if (Res-WWList.Word[i].origin ==
UDM_WORD_ORIGIN_STOP) {
if(wordinfo[0]) strcat(wordinfo,, );
@@ -2167,7 +2168,7 @@
#if UDM_VERSION_ID = 30204
case UDM_PARAM_WORDINFO_ALL:
{
- int len,i;
+ int len,i,j;
for(len = i = 0; i Res-WWList.nwords; i++)
len += Res-WWList.Word[i].len;
{
@@ -2177,23 +2178,19 @@
*wordinfo = '\0';
- for(i = 0; i Res-WWList.nwords; i++){
- if (Res-WWList.Word[i].order != corder) {
- if(wordinfo[0]) {
- sprintf(UDM_STREND(wordinfo), / %d, ,
ccount);
- }
- ccount = Res-WWList.Word[i].count;
- if (Res-WWList.Word[i].origin ==
UDM_WORD_ORIGIN_STOP) {
- sprintf(UDM_STREND(wordinfo), %s :
stopword, Res-WWList.Word[i].word);
- } else {
- sprintf(UDM_STREND(wordinfo), %s : %d,
Res-WWList.Word[i].word, Res-WWList.Word[i].count);
- corder = Res-WWList.Word[i].order;
- }
- } else {
- ccount += Res-WWList.Word[i].count;
+ for(i = 0; i Res-WWList.nwords; i++) {
+ corder = Res-WWList.Word[i].order;
+ ccount = 0;
+ for(j = 0; j Res-WWList.nwords; j++) {
+ if (Res-WWList.Word[j].order == corder) {
+ ccount += Res-WWList.Word[j].count;
+ }
}
- }
- if (Res-WWList.nwords) {
+ if (Res-WWList.Word[i].origin ==
UDM_WORD_ORIGIN_STOP) {
+ sprintf(UDM_STREND(wordinfo),%s%s :
stopword, (*wordinfo) ? , : , Res-WWList.Word[i].word);
+ } else if (Res-WWList.Word[i].origin ==
UDM_WORD_ORIGIN_QUERY) {
+ sprintf(UDM_STREND(wordinfo),%s%s : %d,
(*wordinfo) ? , : , Res-WWList.Word[i].word, Res-WWList.Word[i].count);
+ } else continue;
sprintf(UDM_STREND(wordinfo), / %d, ccount);
}
RETURN_STRING(wordinfo,1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/sockets sockets.c
On Tue, 2003-07-08 at 08:59, Wez Furlong wrote: FYI: gethostbyname() is thread-safe under win32. I thought so but wasn't sure I have some code hanging around in my libwstreams repository that implements getaddrinfo() using all the possible variations of gethostbyname() or gethostbyname_r() (there are 3 possible prototypes accepting 3, 5 or 6 parameters respectively!) for IPV4 only systems. I will be merging it into PHP once I've tidied it up fully, and it should make for some nice readable resolving code at last. sounds good -Jason --Wez. - Original Message - From: Jason Greene [EMAIL PROTECTED] To: Sascha Schumann [EMAIL PROTECTED] Cc: Sara Golemon [EMAIL PROTECTED]; [EMAIL PROTECTED] Sent: Tuesday, July 08, 2003 2:22 PM Subject: Re: [PHP-CVS] cvs: php-src /ext/sockets sockets.c On Tue, 2003-07-08 at 08:15, Sascha Schumann wrote: On Tue, 8 Jul 2003, Jason Greene wrote: If the platform supports gethostbyname_r(most i know do), that is thread safe. Note the 2 in the name. - Sascha I should have been more specific, we should change the ipv4 resolver code in sockets to use either getaddrinfo or gethostbyname_r, as it is currently not thread safe. The Ipv6 resolver code should just always use getaddrinfo -Jason -- Jason Greene [EMAIL PROTECTED] [EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /sapi/apache2filter config.m4
sniper Tue Jul 8 10:13:10 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/sapi/apache2filter config.m4 Log: MFH Index: php-src/sapi/apache2filter/config.m4 diff -u php-src/sapi/apache2filter/config.m4:1.25.2.7 php-src/sapi/apache2filter/config.m4:1.25.2.8 --- php-src/sapi/apache2filter/config.m4:1.25.2.7 Tue Jul 8 09:54:14 2003 +++ php-src/sapi/apache2filter/config.m4Tue Jul 8 10:13:10 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.25.2.7 2003/07/08 13:54:14 sniper Exp $ +dnl $Id: config.m4,v 1.25.2.8 2003/07/08 14:13:10 sniper Exp $ dnl AC_MSG_CHECKING(for Apache 2.0 filter-module support via DSO through APXS) @@ -52,8 +52,8 @@ PHP_AP_EXTRACT_VERSION($APXS_HTTPD) if test $APACHE_VERSION -le 200; then AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)]) - elif test $APACHE_VERSION -lt 244; then -AC_MSG_ERROR([Please note that Apache version = 2.0.44 is required.]) + elif test $APACHE_VERSION -lt 240; then +AC_MSG_ERROR([Please note that Apache version = 2.0.40 is required.]) fi APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard dns.h
sniper Tue Jul 8 10:46:32 2003 EDT Modified files: /php-src/ext/standard dns.h Log: fix typo (most likely fixes #24533 too) Index: php-src/ext/standard/dns.h diff -u php-src/ext/standard/dns.h:1.16 php-src/ext/standard/dns.h:1.17 --- php-src/ext/standard/dns.h:1.16 Tue Jun 10 16:03:37 2003 +++ php-src/ext/standard/dns.h Tue Jul 8 10:46:32 2003 @@ -18,12 +18,12 @@ +--+ */ -/* $Id: dns.h,v 1.16 2003/06/10 20:03:37 imajes Exp $ */ +/* $Id: dns.h,v 1.17 2003/07/08 14:46:32 sniper Exp $ */ #ifndef DNS_H #define DNS_H -#if HAVE_RES_NMKQUERY HAVE_RES_NSEND HAVE_DN_EXPAND HAVE_DN_SKIPNAME +#if HAVE_RES_NMKQUERY HAVE_RES_NSEND HAVE_DN_EXPAND HAVE_DN_SKIPNAME #define HAVE_DNS_FUNCS 1 #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom element.c
rrichards Tue Jul 8 13:00:49 2003 EDT
Modified files:
/php-src/ext/domelement.c
Log:
fix getElementsByTagName
Index: php-src/ext/dom/element.c
diff -u php-src/ext/dom/element.c:1.6 php-src/ext/dom/element.c:1.7
--- php-src/ext/dom/element.c:1.6 Mon Jul 7 15:37:32 2003
+++ php-src/ext/dom/element.c Tue Jul 8 13:00:49 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: element.c,v 1.6 2003/07/07 19:37:32 rrichards Exp $ */
+/* $Id: element.c,v 1.7 2003/07/08 17:00:49 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -387,11 +387,12 @@
ctxp = xmlXPathNewContext(docp);
ctxp-node = nodep;
- str = (char*) emalloc((name_len+3) * sizeof(char)) ;
- sprintf(str ,//%s,name);
+ str = (char*) emalloc((name_len+13) * sizeof(char)) ;
+ sprintf(str ,descendant::%s,name);
xpathobjp = xmlXPathEval(str, ctxp);
efree(str);
+ ctxp-node = NULL;
if (!xpathobjp) {
RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite/tests sqlite_022.phpt
helly Tue Jul 8 14:56:14 2003 EDT
Added files:
/php-src/ext/sqlite/tests sqlite_022.phpt
Log:
Add test for sqlite_seek()
Index: php-src/ext/sqlite/tests/sqlite_022.phpt
+++ php-src/ext/sqlite/tests/sqlite_022.phpt
--TEST--
sqlite: sqlite_seek
--INI--
sqlite.assoc_case=0
--SKIPIF--
?php # vim:ft=php
if (!extension_loaded(sqlite)) print skip; ?
--FILE--
?php
include blankdb.inc;
$data = array(
one,
two,
three
);
sqlite_query(CREATE TABLE strings(a), $db);
foreach ($data as $str) {
sqlite_query(INSERT INTO strings VALUES('$str'), $db);
}
$res = sqlite_query(SELECT a FROM strings, $db, SQLITE_NUM);
for ($idx = -1; $idx 4; $idx++) {
echo SEEK:$idx\n;
sqlite_seek($res, $idx);
var_dump(sqlite_current($res));
}
echo AGAIN\n;
for ($idx = -1; $idx 4; $idx++) {
echo SEEK:$idx\n;
sqlite_seek($res, $idx);
var_dump(sqlite_current($res));
}
echo DONE!\n;
?
--EXPECT--
SEEK:-1
Warning: sqlite_seek(): row -1 out of range in
/usr/src/php5/ext/sqlite/tests/sqlite_022.php on line 19
array(1) {
[0]=
string(3) one
}
SEEK:0
array(1) {
[0]=
string(3) one
}
SEEK:1
array(1) {
[0]=
string(3) two
}
SEEK:2
array(1) {
[0]=
string(5) three
}
SEEK:3
Warning: sqlite_seek(): row 3 out of range in
/usr/src/php5/ext/sqlite/tests/sqlite_022.php on line 19
array(1) {
[0]=
string(5) three
}
AGAIN
SEEK:-1
Warning: sqlite_seek(): row -1 out of range in
/usr/src/php5/ext/sqlite/tests/sqlite_022.php on line 25
array(1) {
[0]=
string(5) three
}
SEEK:0
array(1) {
[0]=
string(3) one
}
SEEK:1
array(1) {
[0]=
string(3) two
}
SEEK:2
array(1) {
[0]=
string(5) three
}
SEEK:3
Warning: sqlite_seek(): row 3 out of range in
/usr/src/php5/ext/sqlite/tests/sqlite_022.php on line 25
array(1) {
[0]=
string(5) three
}
DONE!
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite sqlite.c
helly Tue Jul 8 14:57:28 2003 EDT
Modified files:
/php-src/ext/sqlite sqlite.c
Log:
Fix bug #24540
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.70 php-src/ext/sqlite/sqlite.c:1.71
--- php-src/ext/sqlite/sqlite.c:1.70Sat Jul 5 16:02:40 2003
+++ php-src/ext/sqlite/sqlite.c Tue Jul 8 14:57:28 2003
@@ -17,7 +17,7 @@
| Marcus Boerger [EMAIL PROTECTED] |
+--+
- $Id: sqlite.c,v 1.70 2003/07/05 20:02:40 helly Exp $
+ $Id: sqlite.c,v 1.71 2003/07/08 18:57:28 helly Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -948,7 +948,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, SQLite support, enabled);
- php_info_print_table_row(2, PECL Module version, PHP_SQLITE_MODULE_VERSION
$Id: sqlite.c,v 1.70 2003/07/05 20:02:40 helly Exp $);
+ php_info_print_table_row(2, PECL Module version, PHP_SQLITE_MODULE_VERSION
$Id: sqlite.c,v 1.71 2003/07/08 18:57:28 helly Exp $);
php_info_print_table_row(2, SQLite Library, sqlite_libversion());
php_info_print_table_row(2, SQLite Encoding, sqlite_libencoding());
php_info_print_table_end();
@@ -2127,7 +2127,7 @@
RETURN_FALSE;
}
- if (row 1 || row = res-nrows) {
+ if (row 0 || row = res-nrows) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, row %d out of range,
row);
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/ircg ircg.c
sas Tue Jul 8 17:46:20 2003 EDT
Modified files:
/php-src/ext/ircg ircg.c
Log:
Add missing entries to callback map
Index: php-src/ext/ircg/ircg.c
diff -u php-src/ext/ircg/ircg.c:1.193 php-src/ext/ircg/ircg.c:1.194
--- php-src/ext/ircg/ircg.c:1.193 Tue Jul 8 00:59:47 2003
+++ php-src/ext/ircg/ircg.c Tue Jul 8 17:46:19 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: ircg.c,v 1.193 2003/07/08 04:59:47 sas Exp $ */
+/* $Id: ircg.c,v 1.194 2003/07/08 21:46:19 sas Exp $ */
/* {{{ includes */
@@ -1942,6 +1942,11 @@
IRCG_CB_MAP_ENTRY(endofwho_handler)
IRCG_CB_MAP_ENTRY(invite_handler)
IRCG_CB_MAP_ENTRY(notice_handler)
+ IRCG_CB_MAP_ENTRY(luserclient_handler)
+ IRCG_CB_MAP_ENTRY(luserme_handler)
+ IRCG_CB_MAP_ENTRY(luserop_handler)
+ IRCG_CB_MAP_ENTRY(luserunknown_handler)
+ IRCG_CB_MAP_ENTRY(luserchannels_handler)
IRCG_CB_MAP_END()
/* {{{ register_hooks */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite sqlite.c
helly Tue Jul 8 19:10:01 2003 EDT
Modified files:
/php-src/ext/sqlite sqlite.c
Log:
fix this stupid error
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.71 php-src/ext/sqlite/sqlite.c:1.72
--- php-src/ext/sqlite/sqlite.c:1.71Tue Jul 8 14:57:28 2003
+++ php-src/ext/sqlite/sqlite.c Tue Jul 8 19:10:01 2003
@@ -17,7 +17,7 @@
| Marcus Boerger [EMAIL PROTECTED] |
+--+
- $Id: sqlite.c,v 1.71 2003/07/08 18:57:28 helly Exp $
+ $Id: sqlite.c,v 1.72 2003/07/08 23:10:01 helly Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -44,7 +44,7 @@
#include zend_default_classes.h
#ifdef HAVE_SPL
-#include ext/spl/spl.h
+#include ext/spl/php_spl.h
#include ext/spl/spl_functions.h
#endif
@@ -948,7 +948,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, SQLite support, enabled);
- php_info_print_table_row(2, PECL Module version, PHP_SQLITE_MODULE_VERSION
$Id: sqlite.c,v 1.71 2003/07/08 18:57:28 helly Exp $);
+ php_info_print_table_row(2, PECL Module version, PHP_SQLITE_MODULE_VERSION
$Id: sqlite.c,v 1.72 2003/07/08 23:10:01 helly Exp $);
php_info_print_table_row(2, SQLite Library, sqlite_libversion());
php_info_print_table_row(2, SQLite Encoding, sqlite_libencoding());
php_info_print_table_end();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: spl / spl_foreach.c
helly Tue Jul 8 19:11:14 2003 EDT
Modified files:
/splspl_foreach.c
Log:
Add some comments
Index: spl/spl_foreach.c
diff -u spl/spl_foreach.c:1.14 spl/spl_foreach.c:1.15
--- spl/spl_foreach.c:1.14 Tue Jun 17 16:18:10 2003
+++ spl/spl_foreach.c Tue Jul 8 19:11:14 2003
@@ -151,6 +151,10 @@
if (proxy-is_a SPL_IS_A_SEQUENCE) {
spl_begin_method_call_no_retval(obj, proxy-obj_ce,
proxy-funcs.rewind, rewind, sizeof(rewind)-1 TSRMLS_CC);
}
+ // now this is an optimization trick:
+ // ZEND_SWITCH_FREE receives the array copy or the spl object
in op1 and has an unused op2
+ // We have to check for op1 being an object that implements
spl_forwar... Or we simply set
+ // op2 and know we can safely free the object as needed, which
is waht we do.
op_array-opcodes[EX(opline)-op2.u.opline_num].op2 = *op1;
}
@@ -238,6 +242,7 @@
/* {{{ ZEND_EXECUTE_HOOK_FUNCTION(ZEND_SWITCH_FREE) */
ZEND_EXECUTE_HOOK_FUNCTION(ZEND_SWITCH_FREE)
{
+ // See not in ZEND_FE_FETCH on setting op2
znode *op2 = EX(opline)-op2;
zval *tmp, **obj = spl_get_zval_ptr_ptr(op2, EX(Ts) TSRMLS_CC);
spl_foreach_proxy *proxy;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: spl / config.m4
helly Tue Jul 8 19:11:36 2003 EDT Modified files: /splconfig.m4 Log: Fix configure options Index: spl/config.m4 diff -u spl/config.m4:1.2 spl/config.m4:1.3 --- spl/config.m4:1.2 Mon Jun 30 19:24:12 2003 +++ spl/config.m4 Tue Jul 8 19:11:36 2003 @@ -1,23 +1,23 @@ -dnl $Id: config.m4,v 1.2 2003/06/30 23:24:12 helly Exp $ +dnl $Id: config.m4,v 1.3 2003/07/08 23:11:36 helly Exp $ dnl config.m4 for extension SPL PHP_ARG_ENABLE(spl, enable SPL suppport, -[ --enable-splEnable Standard PHP Library]) +[ --disable-spl Enable Standard PHP Library], yes) dnl first enable/disable all hooks -PHP_ARG_ENABLE(spl, enable all hooks, +PHP_ARG_ENABLE(spl-hook-all, enable all hooks, [ --enable-spl-hook-all SPL: Enable all hooks]) dnl now all single enable/disable for hooks -PHP_ARG_ENABLE(spl, enable hook on foreach, +PHP_ARG_ENABLE(spl-foreach, enable hook on foreach, [ --disable-spl-foreach SPL: Disable hook on forach], yes) -PHP_ARG_ENABLE(spl, enable hook on array read, +PHP_ARG_ENABLE(spl-array-read, enable hook on array read, [ --enable-spl-array-read SPL: Enable hook on array read]) -PHP_ARG_ENABLE(spl, enable hook on array write, +PHP_ARG_ENABLE(spl-array-write, enable hook on array write, [ --enable-spl-array-writeSPL: Enable hook on array write (+read)]) dnl last do checks on hooks -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: spl /tests foreach_non_spl.phpt
helly Tue Jul 8 19:25:18 2003 EDT
Added files:
/spl/tests foreach_non_spl.phpt
Log:
Currently we're presented all properties with foreach()
Index: spl/tests/foreach_non_spl.phpt
+++ spl/tests/foreach_non_spl.phpt
--TEST--
SPL: foreach non spl classes
--SKIPIF--
?php if (0 !extension_loaded(spl)) print skip; ?
--FILE--
?php
echo 1st try\n;
class c1 {}
$obj = new c1();
foreach($obj as $w) {
echo object:$w\n;
}
echo 2nd try\n;
class c2 {
public $max = 3;
public $num = 0;
function current() {
echo __METHOD__ . \n;
return $this-num;
}
function next() {
echo __METHOD__ . \n;
$this-num++;
}
function has_more() {
echo __METHOD__ . \n;
return $this-num $this-max;
}
function key() {
echo __METHOD__ . \n;
switch($this-num) {
case 0: return 1st;
case 1: return 2nd;
case 2: return 3rd;
default: return ???;
}
}
}
$obj = new c2();
foreach($obj as $v = $w) {
echo object:$v=$w\n;
}
print Done\n;
?
--EXPECTF--
1st try
2nd try
object:max=3
object:num=0
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: spl / spl_foreach.c
Actually, I double checked C99, and // was added, however C89 does not.
-Jason
On Tue, 2003-07-08 at 21:48, Jason Greene wrote:
jason Tue Jul 8 22:48:25 2003 EDT
Modified files:
/spl spl_foreach.c
Log:
Convert C++ comments to C (violates C99, and breaks several compilers)
Index: spl/spl_foreach.c
diff -u spl/spl_foreach.c:1.15 spl/spl_foreach.c:1.16
--- spl/spl_foreach.c:1.15Tue Jul 8 19:11:14 2003
+++ spl/spl_foreach.c Tue Jul 8 22:48:25 2003
@@ -151,10 +151,10 @@
if (proxy-is_a SPL_IS_A_SEQUENCE) {
spl_begin_method_call_no_retval(obj, proxy-obj_ce,
proxy-funcs.rewind, rewind, sizeof(rewind)-1 TSRMLS_CC);
}
- // now this is an optimization trick:
- // ZEND_SWITCH_FREE receives the array copy or the spl object
in op1 and has an unused op2
- // We have to check for op1 being an object that implements
spl_forwar... Or we simply set
- // op2 and know we can safely free the object as needed, which
is waht we do.
+ /* now this is an optimization trick:
+ZEND_SWITCH_FREE receives the array copy or the spl object
in op1 and has an unused op2
+We have to check for op1 being an object that implements
spl_forwar... Or we simply set
+op2 and know we can safely free the object as needed, which
is waht we do. */
op_array-opcodes[EX(opline)-op2.u.opline_num].op2 = *op1;
}
@@ -242,7 +242,7 @@
/* {{{ ZEND_EXECUTE_HOOK_FUNCTION(ZEND_SWITCH_FREE) */
ZEND_EXECUTE_HOOK_FUNCTION(ZEND_SWITCH_FREE)
{
- // See not in ZEND_FE_FETCH on setting op2
+ /* See not in ZEND_FE_FETCH on setting op2 */
znode *op2 = EX(opline)-op2;
zval *tmp, **obj = spl_get_zval_ptr_ptr(op2, EX(Ts) TSRMLS_CC);
spl_foreach_proxy *proxy;
--
Jason Greene [EMAIL PROTECTED]
[EMAIL PROTECTED]
Children's talent to endure stems from their ignorance of alternatives.
-- Maya Angelou, I Know Why the Caged Bird Sings
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xml expat_compat.h
sterlingTue Jul 8 23:14:41 2003 EDT Modified files: /php-src/ext/xmlexpat_compat.h Log: boom bam bing Index: php-src/ext/xml/expat_compat.h diff -u php-src/ext/xml/expat_compat.h:1.10 php-src/ext/xml/expat_compat.h:1.11 --- php-src/ext/xml/expat_compat.h:1.10 Sun Jun 15 16:40:45 2003 +++ php-src/ext/xml/expat_compat.h Tue Jul 8 23:14:41 2003 @@ -16,13 +16,15 @@ +--+ */ -/* $Id: expat_compat.h,v 1.10 2003/06/15 20:40:45 moriyoshi Exp $ */ +/* $Id: expat_compat.h,v 1.11 2003/07/09 03:14:41 sterling Exp $ */ #ifndef PHP_EXPAT_COMPAT_H #define PHP_EXPAT_COMPAT_H #if !defined(HAVE_LIBEXPAT) defined(HAVE_LIBXML) #define LIBXML_EXPAT_COMPAT 1 + +#include php_compat.h #include libxml/hash.h #include libxml/parser.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
