Re: [PHP-CVS] cvs: php-src /ext/xml/tests bug26614.phpt bug26614_libxml.phpt
In-Reply-To: <[EMAIL PROTECTED]> Message-ID: <[EMAIL PROTECTED]> References: <[EMAIL PROTECTED]> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII On Sun, 17 Jul 2005, Marcus Boerger wrote: > Log: > - If you ask me both (expat and libxml) are not really accurate about byte > positions and columns...however the line number information is now > correct for both so for the moment we live with the situation that they > return different byte and column information. Hello -- Can you provide test cases for this? Daniel with libxml2 is usually pretty good at either fixing a bug when he can reproduce it, or providing a strong justification for why he thinks the libxml2 behavior is correct. :) Rob has already filted back a bunch of fixes and reports we get through the bug system. I would rather us get this fixed downstream than dealing with it in PHP. -adam -- [EMAIL PROTECTED] | http://www.trachtenberg.com author of o'reilly's "upgrading to php 5" and "php cookbook" avoid the holiday rush, buy your copies today! -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /main php_variables.c
case PARSE_COOKIE: - separator = ";\0"; + /* The , and space are needed for instances when there are multiple Cookie: headers */ + separator = ";, \0"; break; } This patch breaks Backward Compatibility. Multiple COOKIE headers are uncommon. Unencoded ',' are common in cookies. F.e. all Falk AG adsites use them. We already reverted this patch when Jani commited it some weeks ago. Stefan -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /main php_variables.c
The Cookie RFC (2109) clearly states that spaces are permitted between tokens and that a comma is a valid separator. PHP's own setcookie() function will refuse to create cookies containing spaces or commas in their names. At the same time, while uncommon it is perfectly valid to have multiple Cookie: headers within the response, something on which PHP currently badly breaks. Ex. Cookie: testA=1, testB=2 _COOKIE['testA'] = '1, testB=2'; Ilia Stefan Esser wrote: case PARSE_COOKIE: -separator = ";\0"; +/* The , and space are needed for instances when there are multiple Cookie: headers */ +separator = ";, \0"; break; } This patch breaks Backward Compatibility. Multiple COOKIE headers are uncommon. Unencoded ',' are common in cookies. F.e. all Falk AG adsites use them. We already reverted this patch when Jani commited it some weeks ago. Stefan -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /main php_variables.c
Ilia Alshanetsky wrote: The Cookie RFC (2109) Is irrelevant, because PHP never supported the cookie format described there. PHP only knows about the Netscape Cookie Specification. And that Specification only allows ; as separator and all other chars SHOULD be encoded, but because no encoding it is specified, it is not a must. Stefan Esser -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main/streams plain_wrapper.c
wez Mon Jul 18 09:28:26 2005 EDT
Modified files:
/php-src/main/streams plain_wrapper.c
Log:
Apparently our pipe detection code just above this isn't foolproof.
Catch it here.
http://cvs.php.net/diff.php/php-src/main/streams/plain_wrapper.c?r1=1.49&r2=1.50&ty=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.49
php-src/main/streams/plain_wrapper.c:1.50
--- php-src/main/streams/plain_wrapper.c:1.49 Sun Jul 17 14:39:24 2005
+++ php-src/main/streams/plain_wrapper.cMon Jul 18 09:28:24 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: plain_wrapper.c,v 1.49 2005/07/17 18:39:24 helly Exp $ */
+/* $Id: plain_wrapper.c,v 1.50 2005/07/18 13:28:24 wez Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -208,6 +208,12 @@
stream->flags |= PHP_STREAM_FLAG_NO_SEEK;
} else {
stream->position = lseek(self->fd, 0, SEEK_CUR);
+#ifdef ESPIPE
+ if (stream->position == (off_t)-1 && errno == ESPIPE) {
+ stream->position = 0;
+ stream->is_pipe = 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/curl interface.c
iliaa Mon Jul 18 09:47:36 2005 EDT
Modified files:
/php-src/ext/curl interface.c
Log:
Cleanup buffers on handle re-use.
http://cvs.php.net/diff.php/php-src/ext/curl/interface.c?r1=1.60&r2=1.61&ty=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.60 php-src/ext/curl/interface.c:1.61
--- php-src/ext/curl/interface.c:1.60 Sat Jul 16 14:33:09 2005
+++ php-src/ext/curl/interface.cMon Jul 18 09:47:33 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.60 2005/07/16 18:33:09 iliaa Exp $ */
+/* $Id: interface.c,v 1.61 2005/07/18 13:47:33 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -1255,11 +1255,7 @@
Cleanup an execution phase */
void _php_curl_cleanup_handle(php_curl *ch)
{
- if (ch->uses < 1) {
- return;
- }
-
- if (ch->handlers->write->buf.len) {
+ if (ch->handlers->write->buf.len > 0) {
memset(&ch->handlers->write->buf, 0, sizeof(smart_str));
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main/streams plain_wrapper.c
wez Mon Jul 18 10:12:54 2005 EDT
Modified files:
/php-src/main/streams plain_wrapper.c
Log:
compile before commit (gah!)
http://cvs.php.net/diff.php/php-src/main/streams/plain_wrapper.c?r1=1.50&r2=1.51&ty=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.50
php-src/main/streams/plain_wrapper.c:1.51
--- php-src/main/streams/plain_wrapper.c:1.50 Mon Jul 18 09:28:24 2005
+++ php-src/main/streams/plain_wrapper.cMon Jul 18 10:12:52 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: plain_wrapper.c,v 1.50 2005/07/18 13:28:24 wez Exp $ */
+/* $Id: plain_wrapper.c,v 1.51 2005/07/18 14:12:52 wez Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -211,7 +211,7 @@
#ifdef ESPIPE
if (stream->position == (off_t)-1 && errno == ESPIPE) {
stream->position = 0;
- stream->is_pipe = 1;
+ self->is_pipe = 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/pdo_sqlite sqlite_statement.c
wez Mon Jul 18 10:40:49 2005 EDT
Modified files:
/php-src/ext/pdo_sqlite sqlite_statement.c
Log:
this needs to be the column count, otherwise a db->query() that returns 0 rows
will fail rather than returning a statement with no rows.
http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/sqlite_statement.c?r1=1.16&r2=1.17&ty=u
Index: php-src/ext/pdo_sqlite/sqlite_statement.c
diff -u php-src/ext/pdo_sqlite/sqlite_statement.c:1.16
php-src/ext/pdo_sqlite/sqlite_statement.c:1.17
--- php-src/ext/pdo_sqlite/sqlite_statement.c:1.16 Sat Jul 9 00:37:27 2005
+++ php-src/ext/pdo_sqlite/sqlite_statement.c Mon Jul 18 10:40:49 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sqlite_statement.c,v 1.16 2005/07/09 04:37:27 iliaa Exp $ */
+/* $Id: sqlite_statement.c,v 1.17 2005/07/18 14:40:49 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -165,7 +165,7 @@
{
pdo_sqlite_stmt *S = (pdo_sqlite_stmt*)stmt->driver_data;
- if(colno >= sqlite3_data_count(S->stmt)) {
+ if(colno >= sqlite3_column_count(S->stmt)) {
/* error invalid column */
pdo_sqlite_error_stmt(stmt);
return 0;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo pdo_sql_parser.re
wez Mon Jul 18 10:44:14 2005 EDT
Modified files:
/php-src/ext/pdopdo_sql_parser.re
Log:
avoid :: when looking for named parameters.
Refs Bug #33736.
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_sql_parser.re?r1=1.26&r2=1.27&ty=u
Index: php-src/ext/pdo/pdo_sql_parser.re
diff -u php-src/ext/pdo/pdo_sql_parser.re:1.26
php-src/ext/pdo/pdo_sql_parser.re:1.27
--- php-src/ext/pdo/pdo_sql_parser.re:1.26 Mon Jul 11 23:19:44 2005
+++ php-src/ext/pdo/pdo_sql_parser.re Mon Jul 18 10:44:14 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: pdo_sql_parser.re,v 1.26 2005/07/12 03:19:44 wez Exp $ */
+/* $Id: pdo_sql_parser.re,v 1.27 2005/07/18 14:44:14 wez Exp $ */
#include "php.h"
#include "php_pdo_driver.h"
@@ -57,11 +57,12 @@
/*!re2c
(["] (ESCQQ|ANYNOEOF\[\\"])* ["]) {
RET(PDO_PARSER_TEXT); }
(['] (ESCQ|ANYNOEOF\[\\"])* [']){
RET(PDO_PARSER_TEXT); }
- BINDCHR { RET(PDO_PARSER_BIND); }
- QUESTION{ RET(PDO_PARSER_BIND_POS); }
- SPECIALS{ RET(PDO_PARSER_TEXT); }
- (ANYNOEOF\SPECIALS)+ { RET(PDO_PARSER_TEXT); }
- EOF { RET(PDO_PARSER_EOI); }
+ SPECIALS{2,}
{ RET(PDO_PARSER_TEXT); }
+ BINDCHR
{ RET(PDO_PARSER_BIND); }
+ QUESTION
{ RET(PDO_PARSER_BIND_POS); }
+ SPECIALS
{ RET(PDO_PARSER_TEXT); }
+ (ANYNOEOF\SPECIALS)+{
RET(PDO_PARSER_TEXT); }
+ EOF
{ RET(PDO_PARSER_EOI); }
*/
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo pdo_sql_parser.c
wez Mon Jul 18 10:44:56 2005 EDT
Modified files:
/php-src/ext/pdopdo_sql_parser.c
Log:
touch generated file
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_sql_parser.c?r1=1.32&r2=1.33&ty=u
Index: php-src/ext/pdo/pdo_sql_parser.c
diff -u php-src/ext/pdo/pdo_sql_parser.c:1.32
php-src/ext/pdo/pdo_sql_parser.c:1.33
--- php-src/ext/pdo/pdo_sql_parser.c:1.32 Tue Jul 12 03:06:01 2005
+++ php-src/ext/pdo/pdo_sql_parser.cMon Jul 18 10:44:56 2005
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.8 on Tue Jul 12 10:05:35 2005 */
+/* Generated by re2c 0.9.3 on Mon Jul 18 10:44:40 2005 */
#line 1 "pdo_sql_parser.re"
/*
+--+
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_sql_parser.c,v 1.32 2005/07/12 07:06:01 sniper Exp $ */
+/* $Id: pdo_sql_parser.c,v 1.33 2005/07/18 14:44:56 wez Exp $ */
#include "php.h"
#include "php_pdo_driver.h"
@@ -49,172 +49,259 @@
#line 55 "pdo_sql_parser.re"
- {
- static unsigned char yybm[] = {
- 0, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 0, 168, 168, 168, 168, 192,
- 168, 168, 168, 168, 168, 168, 168, 168,
- 184, 184, 184, 184, 184, 184, 184, 184,
- 184, 184, 160, 168, 168, 168, 168, 160,
- 168, 184, 184, 184, 184, 184, 184, 184,
- 184, 184, 184, 184, 184, 184, 184, 184,
- 184, 184, 184, 184, 184, 184, 184, 184,
- 184, 184, 184, 168, 8, 168, 168, 184,
- 168, 184, 184, 184, 184, 184, 184, 184,
- 184, 184, 184, 184, 184, 184, 184, 184,
- 184, 184, 184, 184, 184, 184, 184, 184,
- 184, 184, 184, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168,
- };
-
-#line 89 ""
+
+#line 7 ""
{
YYCTYPE yych;
unsigned int yyaccept;
+ static unsigned char yybm[] = {
+ 0, 161, 161, 161, 161, 161, 161, 161,
+ 161, 161, 161, 161, 161, 161, 161, 161,
+ 161, 161, 161, 161, 161, 161, 161, 161,
+ 161, 161, 161, 161, 161, 161, 161, 161,
+ 161, 161, 2, 161, 161, 161, 161, 202,
+ 161, 161, 161, 161, 161, 161, 161, 161,
+ 165, 165, 165, 165, 165, 165, 165, 165,
+ 165, 165, 242, 161, 161, 161, 161, 242,
+ 161, 165, 165, 165, 165, 165, 165, 165,
+ 165, 165, 165, 165, 165, 165, 165, 165,
+ 165, 165, 165, 165, 165, 165, 165, 165,
+ 165, 165, 165, 161, 1, 161, 161, 165,
+ 161, 165, 165, 165, 165, 165, 165, 165,
+ 165, 165, 165, 165, 165, 165, 165, 165,
+ 165, 165, 165, 165, 165, 165, 165, 165,
+ 165, 165, 165, 161, 161, 161, 161, 161,
+ 161, 161, 161, 161, 161, 161, 161, 161,
+ 161, 161, 161, 161, 161, 161, 161, 161,
+ 161, 161, 161, 161, 161, 161, 161, 161,
+ 161, 161, 161, 161, 161, 161, 161, 161,
+ 161, 161, 161, 161, 161, 161, 161, 161,
+ 161, 161, 161, 161, 161, 161, 161, 161,
+ 161, 161, 161, 161, 161, 161, 161, 161,
+ 161, 161, 161, 161, 161, 161, 161, 161,
+ 161, 161, 161, 161, 161, 161, 161, 161,
+ 161, 161, 161, 161, 161, 161, 161, 161,
+ 161, 161, 161, 161, 161, 161, 161, 161,
+ 161, 161, 161, 161, 161, 161, 161, 161,
+ 161, 161, 161, 161, 161, 161, 161, 161,
+ 161, 161, 161, 161, 161, 161, 161, 161,
+ 161, 161, 161, 161, 161, 161, 161, 161,
+ 161, 161, 161, 161, 161, 161, 161, 161,
+ };
goto yy0;
- ++YYCURSOR;
+yy1: ++YYCURSOR;
yy0:
- if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+ if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
yych = *YYCURSOR;
- if(yybm[0+yych] & 8) {
- goto yy8;
- }
- if(yych <= 0x00)goto yy11;
+ if(yybm[0+yych] & 1)goto yy8;
+ if(yych <= '\000') goto yy11;
if(yych <= '&') goto yy2;
if(yych <= '\'')goto yy4;
if(yych <= '>') goto yy5;
goto yy6;
yy2: yyaccept = 0;
yych = *(YYMARKER = ++YYCURSOR
[PHP-CVS] cvs: php-src /ext/pdo pdo_stmt.c
wez Mon Jul 18 10:46:55 2005 EDT
Modified files:
/php-src/ext/pdopdo_stmt.c
Log:
make a start on a debugging function.
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_stmt.c?r1=1.111&r2=1.112&ty=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.111 php-src/ext/pdo/pdo_stmt.c:1.112
--- php-src/ext/pdo/pdo_stmt.c:1.111Mon Jul 11 23:19:44 2005
+++ php-src/ext/pdo/pdo_stmt.c Mon Jul 18 10:46:55 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.111 2005/07/12 03:19:44 wez Exp $ */
+/* $Id: pdo_stmt.c,v 1.112 2005/07/18 14:46:55 wez Exp $ */
/* The PDO Statement Handle Class */
@@ -1776,6 +1776,48 @@
}
/* }}} */
+/* {{{ proto void PDOStatement::debugDumpParams()
+ A utility for internals hackers to debug parameter internals */
+static PHP_METHOD(PDOStatement, debugDumpParams)
+{
+ pdo_stmt_t *stmt = (pdo_stmt_t*)zend_object_store_get_object(getThis()
TSRMLS_CC);
+ php_stream *out = php_stream_open_wrapper("php://output", "w", 0, NULL);
+ HashPosition pos;
+ struct pdo_bound_param_data *param;
+
+ php_stream_printf(out TSRMLS_CC, "SQL: [%d] %.*s\n",
+ stmt->query_stringlen,
+ stmt->query_stringlen, stmt->query_string);
+
+ php_stream_printf(out TSRMLS_CC, "Params: %d\n",
+ stmt->bound_params ? zend_hash_num_elements(stmt->bound_params)
: 0);
+
+ if (stmt->bound_params) {
+ zend_hash_internal_pointer_reset_ex(stmt->bound_params, &pos);
+ while (SUCCESS ==
zend_hash_get_current_data_ex(stmt->bound_params,
+ (void**)¶m, &pos)) {
+ char *str;
+ uint len;
+ ulong num;
+
+ if (zend_hash_get_current_key_ex(stmt->bound_params,
&str, &len, &num, 0, &pos) == HASH_KEY_IS_STRING) {
+ php_stream_printf(out TSRMLS_CC, "Key: Position
#%d:\n", num);
+ } else {
+ php_stream_printf(out TSRMLS_CC, "Key: Name:
[%d] %.*s\n", len, len, str);
+ }
+
+ php_stream_printf(out TSRMLS_CC, "paramno=%d\nname=[%d]
%.*s\nis_param=%d\nparam_type=%d\n",
+ param->paramno, param->namelen, param->namelen,
param->name,
+ param->is_param,
+ param->param_type);
+
+ }
+ }
+
+ php_stream_close(out);
+}
+/* }}} */
+
function_entry pdo_dbstmt_functions[] = {
PHP_ME(PDOStatement, execute, NULL,
ZEND_ACC_PUBLIC)
@@ -1795,6 +1837,7 @@
PHP_ME(PDOStatement, setFetchMode, NULL,
ZEND_ACC_PUBLIC)
PHP_ME(PDOStatement, nextRowset,NULL,
ZEND_ACC_PUBLIC)
PHP_ME(PDOStatement, closeCursor, NULL,
ZEND_ACC_PUBLIC)
+ PHP_ME(PDOStatement, debugDumpParams, NULL,
ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
};
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
rasmus Mon Jul 18 11:29:16 2005 EDT Modified files: /CVSROOTavail Log: pear karma for Manfred http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.996&r2=1.997&ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.996 CVSROOT/avail:1.997 --- CVSROOT/avail:1.996 Fri Jul 15 07:13:29 2005 +++ CVSROOT/avail Mon Jul 18 11:29:14 2005 @@ -54,7 +54,7 @@ # The PEAR Team has access to the full PEAR tree, the PEAR portion of # the PHP tree, the PEAR website, and the PEAR documentation. -avail|andrew,moh,sterling,jon,jlp,sebastian,troels,urs,jpm,adaniel,tuupola,mj,metallic,richard,aj,andre,zimt,uw,bjoern,chregu,tfromm,subjective,cox,jmcastagnetto,kaltoft,jccann,amiller,mansion,zyprexia,alexmerz,yavo,clambert,vblavet,bernd,nohn,mog,mfischer,kvn,jan,eru,murahachibu,hayk,cain,nhoizey,aditus,ludoo,imajes,graeme,eriksson,jasonlotito,dallen,lsmith,timmyg,artka,tal,kk,cmv,rashid,alexios,baba,reywob,ekilfoil,antonio,sagi,jrust,mehl,dickmann,alan_k,fab,thku,busterb,miked,pgc,ctrlsoft,tychay,dexter,sachat,svenasse,mw21st,arahn,matthias,dias,jfbus,derick,chief,sigi,tony,olivier,nepto,voyteck,cnb,dams,peterk,ernani,edink,quipo,egnited,arnaud,mcmontero,mbretter,nicos,philip,xnoguer,sjr,meebey,jellybob,darkelder,max,dcowgill,daggilli,kuboa,ncowham,sklar,krausbn,ordnas,avb,polone,datenpunk,inorm,llucax,davey,moosh,et,mscifo,yunosh,thesaur,hburbach,ohill,cellog,hlellelid,rmcclain,vincent,heino,neufeind,didou,schst,alain,mrcool,mroch,mike,vgoebbels,mixtli,farell,pmjones,jw,darknoise,tarjei,toby,danielc,ieure,metz,gurugeek,rich_y,asnagy,muesli,hcebay,khassani,zamana,aidan,dufuz,sergiosgc,kouber,enemerson,iridium,ortega,guillaume,koyama,scottmattocks,eric,wenz,goetsch,tacker,aph,bolk,cweiske,amt,jinxidoru,cbleek,nosey,abaker,jayeshsh,fredericpoeydome,sean,toggg,navin,pfischer,davidc,markus,cross|pear,peardoc +avail|andrew,moh,sterling,jon,jlp,sebastian,troels,urs,jpm,adaniel,tuupola,mj,metallic,richard,aj,andre,zimt,uw,bjoern,chregu,tfromm,subjective,cox,jmcastagnetto,kaltoft,jccann,amiller,mansion,zyprexia,alexmerz,yavo,clambert,vblavet,bernd,nohn,mog,mfischer,kvn,jan,eru,murahachibu,hayk,cain,nhoizey,aditus,ludoo,imajes,graeme,eriksson,jasonlotito,dallen,lsmith,timmyg,artka,tal,kk,cmv,rashid,alexios,baba,reywob,ekilfoil,antonio,sagi,jrust,mehl,dickmann,alan_k,fab,thku,busterb,miked,pgc,ctrlsoft,tychay,dexter,sachat,svenasse,mw21st,arahn,matthias,dias,jfbus,derick,chief,sigi,tony,olivier,nepto,voyteck,cnb,dams,peterk,ernani,edink,quipo,egnited,arnaud,mcmontero,mbretter,nicos,philip,xnoguer,sjr,meebey,jellybob,darkelder,max,dcowgill,daggilli,kuboa,ncowham,sklar,krausbn,ordnas,avb,polone,datenpunk,inorm,llucax,davey,moosh,et,mscifo,yunosh,thesaur,hburbach,ohill,cellog,hlellelid,rmcclain,vincent,heino,neufeind,didou,schst,alain,mrcool,mroch,mike,vgoebbels,mixtli,farell,pmjones,jw,darknoise,tarjei,toby,danielc,ieure,metz,gurugeek,rich_y,asnagy,muesli,hcebay,khassani,zamana,aidan,dufuz,sergiosgc,kouber,enemerson,iridium,ortega,guillaume,koyama,scottmattocks,eric,wenz,goetsch,tacker,aph,bolk,cweiske,amt,jinxidoru,cbleek,nosey,abaker,jayeshsh,fredericpoeydome,sean,toggg,navin,pfischer,davidc,markus,cross,crafics|pear,peardoc # PEAR bits in the main php-src module avail|cox,mj,vblavet,dickmann,tal,jmcastagnetto,alexmerz,cellog,pajoye|php-src/pear,pear-core -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard dl.c /main main.c
dmitry Mon Jul 18 12:20:08 2005 EDT
Modified files:
/php-src/main main.c
/php-src/ext/standard dl.c
Log:
Fixed bug in new module statrup mechanism
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.637&r2=1.638&ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.637 php-src/main/main.c:1.638
--- php-src/main/main.c:1.637 Sat Jul 16 08:21:34 2005
+++ php-src/main/main.c Mon Jul 18 12:20:07 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.637 2005/07/16 12:21:34 hyanantha Exp $ */
+/* $Id: main.c,v 1.638 2005/07/18 16:20:07 dmitry Exp $ */
/* {{{ includes
*/
@@ -1296,7 +1296,7 @@
while (ptr < end) {
if (*ptr) {
- if (zend_register_internal_module(*ptr
TSRMLS_CC)==FAILURE) {
+ if (zend_register_internal_module(*ptr
TSRMLS_CC)==NULL) {
return FAILURE;
}
}
http://cvs.php.net/diff.php/php-src/ext/standard/dl.c?r1=1.102&r2=1.103&ty=u
Index: php-src/ext/standard/dl.c
diff -u php-src/ext/standard/dl.c:1.102 php-src/ext/standard/dl.c:1.103
--- php-src/ext/standard/dl.c:1.102 Thu Jun 30 09:43:00 2005
+++ php-src/ext/standard/dl.c Mon Jul 18 12:20:08 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dl.c,v 1.102 2005/06/30 13:43:00 dmitry Exp $ */
+/* $Id: dl.c,v 1.103 2005/07/18 16:20:08 dmitry Exp $ */
#include "php.h"
#include "dl.h"
@@ -219,7 +219,7 @@
module_entry->module_number = zend_next_free_module();
module_entry->handle = handle;
- if (zend_register_module_ex(module_entry TSRMLS_CC) == FAILURE) {
+ if ((module_entry = zend_register_module_ex(module_entry TSRMLS_CC)) ==
NULL) {
DL_UNLOAD(handle);
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/pdo pdo_sql_parser.c
sniper Mon Jul 18 12:08:38 2005 EDT
Modified files:
/php-src/ext/pdopdo_sql_parser.c
Log:
touch with working re2c
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_sql_parser.c?r1=1.33&r2=1.34&ty=u
Index: php-src/ext/pdo/pdo_sql_parser.c
diff -u php-src/ext/pdo/pdo_sql_parser.c:1.33
php-src/ext/pdo/pdo_sql_parser.c:1.34
--- php-src/ext/pdo/pdo_sql_parser.c:1.33 Mon Jul 18 10:44:56 2005
+++ php-src/ext/pdo/pdo_sql_parser.cMon Jul 18 12:08:37 2005
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.3 on Mon Jul 18 10:44:40 2005 */
+/* Generated by re2c 0.9.8 on Mon Jul 18 19:08:15 2005 */
#line 1 "pdo_sql_parser.re"
/*
+--+
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_sql_parser.c,v 1.33 2005/07/18 14:44:56 wez Exp $ */
+/* $Id: pdo_sql_parser.c,v 1.34 2005/07/18 16:08:37 sniper Exp $ */
#include "php.h"
#include "php_pdo_driver.h"
@@ -49,11 +49,7 @@
#line 55 "pdo_sql_parser.re"
-
-#line 7 ""
-{
- YYCTYPE yych;
- unsigned int yyaccept;
+ {
static unsigned char yybm[] = {
0, 161, 161, 161, 161, 161, 161, 161,
161, 161, 161, 161, 161, 161, 161, 161,
@@ -88,32 +84,43 @@
161, 161, 161, 161, 161, 161, 161, 161,
161, 161, 161, 161, 161, 161, 161, 161,
};
+
+#line 89 ""
+{
+ YYCTYPE yych;
+ unsigned int yyaccept;
goto yy0;
-yy1: ++YYCURSOR;
+ ++YYCURSOR;
yy0:
if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
yych = *YYCURSOR;
- if(yybm[0+yych] & 1)goto yy8;
- if(yych <= '\000') goto yy11;
+ if(yybm[0+yych] & 1) {
+ goto yy8;
+ }
+ if(yych <= 0x00)goto yy11;
if(yych <= '&') goto yy2;
if(yych <= '\'')goto yy4;
if(yych <= '>') goto yy5;
goto yy6;
yy2: yyaccept = 0;
yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 64) goto yy32;
- if(yych <= '\000') goto yy3;
+ if(yybm[0+yych] & 64) {
+ goto yy32;
+ }
+ if(yych <= 0x00)goto yy3;
if(yych == '"') goto yy30;
goto yy35;
yy3:
#line 63 "pdo_sql_parser.re"
{ RET(PDO_PARSER_TEXT); }
-#line 65 ""
+#line 117 ""
yy4: yyaccept = 0;
yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 8)goto yy19;
+ if(yybm[0+yych] & 8) {
+ goto yy19;
+ }
if(yych <= '9'){
- if(yych <= '\000') goto yy3;
+ if(yych <= 0x00)goto yy3;
if(yych == '"') goto yy13;
goto yy25;
} else {
@@ -122,7 +129,9 @@
goto yy25;
}
yy5: yych = *++YYCURSOR;
- if(yybm[0+yych] & 2)goto yy13;
+ if(yybm[0+yych] & 2) {
+ goto yy13;
+ }
if(yych <= 'Z'){
if(yych <= '/') goto yy3;
if(yych <= ':') goto yy16;
@@ -139,58 +148,68 @@
}
}
yy6: ++YYCURSOR;
- if(yybm[0+(yych = *YYCURSOR)] & 2) yych = *YYCURSOR;
- goto yy13;
+ if(yybm[0+(yych = *YYCURSOR)] & 2) {
+ yych = *YYCURSOR;
+ goto yy13;
+ }
goto yy7;
yy7:
#line 62 "pdo_sql_parser.re"
{ RET(PDO_PARSER_BIND_POS); }
-#line 101 ""
+#line 160 ""
yy8: ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
goto yy9;
-yy9: if(yybm[0+yych] & 1)goto yy8;
+yy9: if(yybm[0+yych] & 1) {
+ goto yy8;
+ }
goto yy10;
yy10:
#line 64 "pdo_sql_parser.re"
{ RET(PDO_PARSER_TEXT); }
-#line 112 ""
+#line 172 ""
yy11: ++YYCURSOR;
goto yy12;
yy12:
#line 65 "pdo_sql_parser.re"
{ RET(PDO_PARSER_EOI); }
-#line 118 ""
+#line 178 ""
yy13: ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
goto yy14;
-yy14: if(yybm[0+yych] & 2)goto yy13;
+yy14: if(yybm[0+yych] & 2) {
+ goto yy13;
+ }
goto yy15;
yy15:
#line 60 "pdo_sql_parser.re"
{ RET(PDO_PARSER_TEXT); }
-#line 129 ""
+#line 190 ""
yy16: ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
goto yy17;
-yy17: if(yybm[0+yych] & 4)goto yy16;
+yy17: if(yybm[0+yych] & 4) {
+ goto yy16;
+ }
goto yy18;
yy18:
#line 61 "pdo_sql_parser.re"
{ RET(PDO_PARSER_BIND); }
-#line 140 ""
+#line 202 ""
yy19: yyaccept = 1;
YYMARKER = ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
goto yy20;
-yy20: if(yybm[0+yych] & 8)goto yy19;
+yy20: if(yybm[0+yych] & 8) {
+ goto yy19;
+ }
if(yych <= ':'){
if(yych <= '!'){
- if(yych >= '\001') goto yy24;
+ if(yych >= 0x01)goto yy24;
[PHP-CVS] cvs: php-src / acinclude.m4
sniper Mon Jul 18 13:20:24 2005 EDT Modified files: /php-srcacinclude.m4 Log: fix macro http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.331&r2=1.332&ty=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.331 php-src/acinclude.m4:1.332 --- php-src/acinclude.m4:1.331 Wed Jul 13 20:12:22 2005 +++ php-src/acinclude.m4Mon Jul 18 13:20:24 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.331 2005/07/14 00:12:22 sniper Exp $ +dnl $Id: acinclude.m4,v 1.332 2005/07/18 17:20:24 sniper Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -2492,7 +2492,7 @@ dnl Check if field re_magic exists in struct regex_t AC_CACHE_CHECK([whether field re_magic exists in struct regex_t], ac_cv_regex_t_re_magic, [ AC_TRY_COMPILE([#include -#include ], [struct regex_t rt; rt.re_magic;], +#include ], [regex_t rt; rt.re_magic;], [ac_cv_regex_t_re_magic=yes], [ac_cv_regex_t_re_magic=no]) ]) if test "$ac_cv_regex_t_re_magic" = "yes"; then -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mcve mcve.c php_mcve.h
On Mon, 18 Jul 2005 16:34:44 -0400 Brad House <[EMAIL PROTECTED]> wrote: > Perhaps. There was discussion once upon a time along those lines, > but nothing else came of it. I'd have to know what it entails, > and if it would prohibit the extension from being distributed > with the main PHP codebase. AFAIK the general plan is to move almost all extensions to PECL (and we're working on it, take a look on how many extensions were moved there in 5.0 and 5.1), so users would be able to get & install only extensions they really need. Personally I don't think that ext/mcve is used by large number of users (I haven't ever heard of someone using it) and IMO that's a perfect reason to move it from the core to PECL. I can be wrong, though. There are also several rather important reasons to do so: 1) you wouldn't depend on PHP release cycles. 2) you would be able to use PECL infrastructure to build Win32 *.dll's 3) Others. All this doesn't mean that users will not be able to install/use the extension or even have some problems with it. Extensions from PECL can be installed with this command: # pear install extname See details here: http://www.php.net/manual/en/install.pecl.php > Forgive my ignorance, but I have > not even looked into what PECL really is. Well, I'd recommend to take a look on it, since you're the maintainer of an extension.. -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mcve mcve.c php_mcve.h
Well, comparitively speaking, to the whole of the PHP audience, there probably aren't that many people using the ext/mcve extension for PHP, but there are a few hundred, anyhow. I'll look into PECL though to see if it is a suitable fit... -Brad Antony Dovgal wrote: > On Mon, 18 Jul 2005 16:34:44 -0400 > Brad House <[EMAIL PROTECTED]> wrote: > > >>Perhaps. There was discussion once upon a time along those lines, >>but nothing else came of it. I'd have to know what it entails, >>and if it would prohibit the extension from being distributed >>with the main PHP codebase. > > > AFAIK the general plan is to move almost all extensions to PECL > (and we're working on it, take a look on how many extensions were moved > there in 5.0 and 5.1), so users would be able to get & install only > extensions they really need. > > Personally I don't think that ext/mcve is used by large number of users > (I haven't ever heard of someone using it) and IMO that's a perfect reason > to move it from the core to PECL. > I can be wrong, though. > > There are also several rather important reasons to do so: > 1) you wouldn't depend on PHP release cycles. > 2) you would be able to use PECL infrastructure to build Win32 *.dll's > 3) Others. > > All this doesn't mean that users will not be able to install/use the > extension > or even have some problems with it. Extensions from PECL can be installed > with this command: > # pear install extname > See details here: http://www.php.net/manual/en/install.pecl.php > > >>Forgive my ignorance, but I have >>not even looked into what PECL really is. > > > Well, I'd recommend to take a look on it, since you're the maintainer of an > extension.. > -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mcve mcve.c php_mcve.h
Perhaps. There was discussion once upon a time along those lines,
but nothing else came of it. I'd have to know what it entails,
and if it would prohibit the extension from being distributed
with the main PHP codebase. Forgive my ignorance, but I have
not even looked into what PECL really is.
-Brad
Antony Dovgal wrote:
> Maybe it's time to move ext/mcve to PECL, where you can safely add new
> functions just before new PHP release?
>
> On Mon, 18 Jul 2005 20:10:09 -
> "Brad House" <[EMAIL PROTECTED]> wrote:
>
>
>>bradmssw Mon Jul 18 16:10:09 2005 EDT
>>
>> Modified files:
>>/php-src/ext/mcve mcve.c php_mcve.h
>> Log:
>> sync missing functions from libmonetra-5
>>
>>http://cvs.php.net/diff.php/php-src/ext/mcve/mcve.c?r1=1.32&r2=1.33&ty=u
>>Index: php-src/ext/mcve/mcve.c
>>diff -u php-src/ext/mcve/mcve.c:1.32 php-src/ext/mcve/mcve.c:1.33
>>--- php-src/ext/mcve/mcve.c:1.32 Thu Jun 30 10:11:11 2005
>>+++ php-src/ext/mcve/mcve.c Mon Jul 18 16:10:06 2005
>>@@ -17,7 +17,7 @@
>>+--+
>> */
>>
>>-/* $Id: mcve.c,v 1.32 2005/06/30 14:11:11 sniper Exp $ */
>>+/* $Id: mcve.c,v 1.33 2005/07/18 20:10:06 bradmssw Exp $ */
>>
>> #ifdef HAVE_CONFIG_H
>> #include "config.h"
>>@@ -60,6 +60,10 @@
>> PHP_FE(m_setdropfile, NULL)
>> PHP_FE(m_setip, NULL)
>> PHP_FE(m_setssl,NULL)
>>+#if LIBMONETRA_VERSION >= 05
>>+ PHP_FE(m_setssl_cafile, NULL)
>>+ PHP_FE(m_responsekeys, NULL)
>>+#endif
>> PHP_FE(m_setssl_files, NULL)
>> PHP_FE(m_settimeout,NULL)
>> PHP_FE(m_setblocking, NULL)
>>@@ -734,6 +738,31 @@
>> }
>> /* }}} */
>>
>>+#if LIBMONETRA_VERSION >= 05
>>+/* {{{ proto int m_setssl_cafile(resource conn, string cafile)
>>+ Set SSL CA (Certificate Authority) file for verification of server
>>+ certificate
>>+*/
>>+PHP_FUNCTION(m_setssl_cafile)
>>+{
>>+ MCVE_CONN *conn;
>>+ int retval;
>>+ zval **arg1, **arg2;
>>+
>>+ if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &arg1, &arg2) ==
>>FAILURE)
>>+ WRONG_PARAM_COUNT;
>>+
>>+
>>+ ZEND_FETCH_RESOURCE(conn, MCVE_CONN *, arg1, -1, "mcve connection",
>>le_conn);
>>+ convert_to_string_ex(arg2);
>>+
>>+ retval = M_SetSSL_CAfile(conn, Z_STRVAL_PP(arg2));
>>+
>>+ RETURN_LONG(retval);
>>+}
>>+/* }}} */
>>+#endif
>>+
>> /* {{{ proto int m_setssl_files(resource conn, string sslkeyfile, string
>> sslcertfile)
>>Set certificate key files and certificates if server requires client
>> certificate
>>verification
>>@@ -1150,6 +1179,36 @@
>> }
>> /* }}} */
>>
>>+#if LIBMONETRA_VERSION >= 05
>>+/* {{{ proto array m_responsekeys(resource conn, long identifier)
>>+ Returns array of strings which represents the keys that can be used
>>+ for response parameters on this transaction
>>+*/
>>+PHP_FUNCTION(m_responsekeys)
>>+{
>>+ MCVE_CONN *conn;
>>+ char **retval;
>>+ int num_keys, i;
>>+ zval **arg1, **arg2;
>>+
>>+ if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &arg1, &arg2) ==
>>FAILURE)
>>+ WRONG_PARAM_COUNT;
>>+
>>+ ZEND_FETCH_RESOURCE(conn, MCVE_CONN *, arg1, -1, "mcve connection",
>>le_conn);
>>+ convert_to_long_ex(arg2);
>>+
>>+ array_init(return_value);
>>+
>>+ retval=M_ResponseKeys(conn, Z_LVAL_PP(arg2), &num_keys);
>>+ if (retval != NULL) {
>>+ for (i=0; i>+ add_next_index_string(return_value, retval[i], 1);
>>+ M_FreeResponseKeys(retval, num_keys);
>>+ }
>>+}
>>+/* }}} */
>>+#endif
>>+
>> /* {{{ proto string m_getuserparam(resource conn, long identifier, int key)
>>Get a user response parameter */
>> PHP_FUNCTION(m_getuserparam)
>>http://cvs.php.net/diff.php/php-src/ext/mcve/php_mcve.h?r1=1.15&r2=1.16&ty=u
>>Index: php-src/ext/mcve/php_mcve.h
>>diff -u php-src/ext/mcve/php_mcve.h:1.15 php-src/ext/mcve/php_mcve.h:1.16
>>--- php-src/ext/mcve/php_mcve.h:1.15 Mon Jun 6 12:43:23 2005
>>+++ php-src/ext/mcve/php_mcve.h Mon Jul 18 16:10:06 2005
>>@@ -16,7 +16,7 @@
>>| Chris Faulhaber <[EMAIL PROTECTED]>
>> |
>>+--+
>> */
>>-/* $Id: php_mcve.h,v 1.15 2005/06/06 16:43:23 bradmssw Exp $ */
>>+/* $Id: php_mcve.h,v 1.16 2005/07/18 20:10:06 bradmssw Exp $ */
>>
>> #ifndef _PHP_MCVE_H
>> #define _PHP_MCVE_H
>>@@ -51,6 +51,10 @@
>> PHP_FUNCTION(m_setdropfile);
>> PHP_FUNCTION(m_setip);
>> PHP_FUNCTION(m_setssl);
>>+#if LIBMONETRA_VERSION >= 05
>>+PHP_FUNCTION(m_setssl_cafile);
>>+PHP_FUNCTION(m_responsekeys);
>>+#endif
>> PHP_FUNCTION(m_setssl_files);
>> PHP_FUNCTION(m_setblocking);
>> PHP_FUNCTION(m_settimeout);
>>
>>--
>>PHP CVS Mailing List (http://www.php.net/
[PHP-CVS] cvs: php-src /ext/mcve mcve.c php_mcve.h
bradmsswMon Jul 18 16:10:09 2005 EDT
Modified files:
/php-src/ext/mcve mcve.c php_mcve.h
Log:
sync missing functions from libmonetra-5
http://cvs.php.net/diff.php/php-src/ext/mcve/mcve.c?r1=1.32&r2=1.33&ty=u
Index: php-src/ext/mcve/mcve.c
diff -u php-src/ext/mcve/mcve.c:1.32 php-src/ext/mcve/mcve.c:1.33
--- php-src/ext/mcve/mcve.c:1.32Thu Jun 30 10:11:11 2005
+++ php-src/ext/mcve/mcve.c Mon Jul 18 16:10:06 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mcve.c,v 1.32 2005/06/30 14:11:11 sniper Exp $ */
+/* $Id: mcve.c,v 1.33 2005/07/18 20:10:06 bradmssw Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -60,6 +60,10 @@
PHP_FE(m_setdropfile, NULL)
PHP_FE(m_setip, NULL)
PHP_FE(m_setssl,NULL)
+#if LIBMONETRA_VERSION >= 05
+ PHP_FE(m_setssl_cafile, NULL)
+ PHP_FE(m_responsekeys, NULL)
+#endif
PHP_FE(m_setssl_files, NULL)
PHP_FE(m_settimeout,NULL)
PHP_FE(m_setblocking, NULL)
@@ -734,6 +738,31 @@
}
/* }}} */
+#if LIBMONETRA_VERSION >= 05
+/* {{{ proto int m_setssl_cafile(resource conn, string cafile)
+ Set SSL CA (Certificate Authority) file for verification of server
+ certificate
+*/
+PHP_FUNCTION(m_setssl_cafile)
+{
+ MCVE_CONN *conn;
+ int retval;
+ zval **arg1, **arg2;
+
+ if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &arg1, &arg2) ==
FAILURE)
+ WRONG_PARAM_COUNT;
+
+
+ ZEND_FETCH_RESOURCE(conn, MCVE_CONN *, arg1, -1, "mcve connection",
le_conn);
+ convert_to_string_ex(arg2);
+
+ retval = M_SetSSL_CAfile(conn, Z_STRVAL_PP(arg2));
+
+ RETURN_LONG(retval);
+}
+/* }}} */
+#endif
+
/* {{{ proto int m_setssl_files(resource conn, string sslkeyfile, string
sslcertfile)
Set certificate key files and certificates if server requires client
certificate
verification
@@ -1150,6 +1179,36 @@
}
/* }}} */
+#if LIBMONETRA_VERSION >= 05
+/* {{{ proto array m_responsekeys(resource conn, long identifier)
+ Returns array of strings which represents the keys that can be used
+ for response parameters on this transaction
+*/
+PHP_FUNCTION(m_responsekeys)
+{
+ MCVE_CONN *conn;
+ char **retval;
+ int num_keys, i;
+ zval **arg1, **arg2;
+
+ if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &arg1, &arg2) ==
FAILURE)
+ WRONG_PARAM_COUNT;
+
+ ZEND_FETCH_RESOURCE(conn, MCVE_CONN *, arg1, -1, "mcve connection",
le_conn);
+ convert_to_long_ex(arg2);
+
+ array_init(return_value);
+
+ retval=M_ResponseKeys(conn, Z_LVAL_PP(arg2), &num_keys);
+ if (retval != NULL) {
+ for (i=0; ihttp://cvs.php.net/diff.php/php-src/ext/mcve/php_mcve.h?r1=1.15&r2=1.16&ty=u
Index: php-src/ext/mcve/php_mcve.h
diff -u php-src/ext/mcve/php_mcve.h:1.15 php-src/ext/mcve/php_mcve.h:1.16
--- php-src/ext/mcve/php_mcve.h:1.15Mon Jun 6 12:43:23 2005
+++ php-src/ext/mcve/php_mcve.h Mon Jul 18 16:10:06 2005
@@ -16,7 +16,7 @@
| Chris Faulhaber <[EMAIL PROTECTED]>|
+--+
*/
-/* $Id: php_mcve.h,v 1.15 2005/06/06 16:43:23 bradmssw Exp $ */
+/* $Id: php_mcve.h,v 1.16 2005/07/18 20:10:06 bradmssw Exp $ */
#ifndef _PHP_MCVE_H
#define _PHP_MCVE_H
@@ -51,6 +51,10 @@
PHP_FUNCTION(m_setdropfile);
PHP_FUNCTION(m_setip);
PHP_FUNCTION(m_setssl);
+#if LIBMONETRA_VERSION >= 05
+PHP_FUNCTION(m_setssl_cafile);
+PHP_FUNCTION(m_responsekeys);
+#endif
PHP_FUNCTION(m_setssl_files);
PHP_FUNCTION(m_setblocking);
PHP_FUNCTION(m_settimeout);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/mcve mcve.c php_mcve.h
bradmsswMon Jul 18 16:11:09 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/mcve mcve.c php_mcve.h
Log:
BACKPORT FROM HEAD: sync missing functions from libmonetra-5
http://cvs.php.net/diff.php/php-src/ext/mcve/mcve.c?r1=1.28.2.3&r2=1.28.2.4&ty=u
Index: php-src/ext/mcve/mcve.c
diff -u php-src/ext/mcve/mcve.c:1.28.2.3 php-src/ext/mcve/mcve.c:1.28.2.4
--- php-src/ext/mcve/mcve.c:1.28.2.3Mon Jun 6 12:43:54 2005
+++ php-src/ext/mcve/mcve.c Mon Jul 18 16:11:09 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mcve.c,v 1.28.2.3 2005/06/06 16:43:54 bradmssw Exp $ */
+/* $Id: mcve.c,v 1.28.2.4 2005/07/18 20:11:09 bradmssw Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -62,6 +62,10 @@
PHP_FE(m_setdropfile, NULL)
PHP_FE(m_setip, NULL)
PHP_FE(m_setssl,NULL)
+#if LIBMONETRA_VERSION >= 05
+ PHP_FE(m_setssl_cafile, NULL)
+ PHP_FE(m_responsekeys, NULL)
+#endif
PHP_FE(m_setssl_files, NULL)
PHP_FE(m_settimeout,NULL)
PHP_FE(m_setblocking, NULL)
@@ -736,6 +740,31 @@
}
/* }}} */
+#if LIBMONETRA_VERSION >= 05
+/* {{{ proto int m_setssl_cafile(resource conn, string cafile)
+ Set SSL CA (Certificate Authority) file for verification of server
+ certificate
+*/
+PHP_FUNCTION(m_setssl_cafile)
+{
+ MCVE_CONN *conn;
+ int retval;
+ zval **arg1, **arg2;
+
+ if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &arg1, &arg2) ==
FAILURE)
+ WRONG_PARAM_COUNT;
+
+
+ ZEND_FETCH_RESOURCE(conn, MCVE_CONN *, arg1, -1, "mcve connection",
le_conn);
+ convert_to_string_ex(arg2);
+
+ retval = M_SetSSL_CAfile(conn, Z_STRVAL_PP(arg2));
+
+ RETURN_LONG(retval);
+}
+/* }}} */
+#endif
+
/* {{{ proto int m_setssl_files(resource conn, string sslkeyfile, string
sslcertfile)
Set certificate key files and certificates if server requires client
certificate
verification
@@ -1152,6 +1181,36 @@
}
/* }}} */
+#if LIBMONETRA_VERSION >= 05
+/* {{{ proto array m_responsekeys(resource conn, long identifier)
+ Returns array of strings which represents the keys that can be used
+ for response parameters on this transaction
+*/
+PHP_FUNCTION(m_responsekeys)
+{
+ MCVE_CONN *conn;
+ char **retval;
+ int num_keys, i;
+ zval **arg1, **arg2;
+
+ if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &arg1, &arg2) ==
FAILURE)
+ WRONG_PARAM_COUNT;
+
+ ZEND_FETCH_RESOURCE(conn, MCVE_CONN *, arg1, -1, "mcve connection",
le_conn);
+ convert_to_long_ex(arg2);
+
+ array_init(return_value);
+
+ retval=M_ResponseKeys(conn, Z_LVAL_PP(arg2), &num_keys);
+ if (retval != NULL) {
+ for (i=0; ihttp://cvs.php.net/diff.php/php-src/ext/mcve/php_mcve.h?r1=1.14.2.1&r2=1.14.2.2&ty=u
Index: php-src/ext/mcve/php_mcve.h
diff -u php-src/ext/mcve/php_mcve.h:1.14.2.1
php-src/ext/mcve/php_mcve.h:1.14.2.2
--- php-src/ext/mcve/php_mcve.h:1.14.2.1Mon Jun 6 12:43:54 2005
+++ php-src/ext/mcve/php_mcve.h Mon Jul 18 16:11:09 2005
@@ -16,7 +16,7 @@
| Chris Faulhaber <[EMAIL PROTECTED]>|
+--+
*/
-/* $Id: php_mcve.h,v 1.14.2.1 2005/06/06 16:43:54 bradmssw Exp $ */
+/* $Id: php_mcve.h,v 1.14.2.2 2005/07/18 20:11:09 bradmssw Exp $ */
#ifndef _PHP_MCVE_H
#define _PHP_MCVE_H
@@ -51,6 +51,10 @@
PHP_FUNCTION(m_setdropfile);
PHP_FUNCTION(m_setip);
PHP_FUNCTION(m_setssl);
+#if LIBMONETRA_VERSION >= 05
+PHP_FUNCTION(m_setssl_cafile);
+PHP_FUNCTION(m_responsekeys);
+#endif
PHP_FUNCTION(m_setssl_files);
PHP_FUNCTION(m_setblocking);
PHP_FUNCTION(m_settimeout);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/standard reg.c
andrei Mon Jul 18 13:34:39 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/ext/standard reg.c
Log:
Use HAVE_REGEX_T_RE_MAGIC to fix compilation problem on systems where
re_magic is not provided publicly.
http://cvs.php.net/diff.php/php-src/ext/standard/reg.c?r1=1.66.2.8&r2=1.66.2.8.2.1&ty=u
Index: php-src/ext/standard/reg.c
diff -u php-src/ext/standard/reg.c:1.66.2.8
php-src/ext/standard/reg.c:1.66.2.8.2.1
--- php-src/ext/standard/reg.c:1.66.2.8 Thu May 26 17:49:04 2005
+++ php-src/ext/standard/reg.c Mon Jul 18 13:34:38 2005
@@ -17,7 +17,7 @@
| Jaakko Hyvätti <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: reg.c,v 1.66.2.8 2005/05/26 21:49:04 andrei Exp $ */
+/* $Id: reg.c,v 1.66.2.8.2.1 2005/07/18 17:34:38 andrei Exp $ */
#include
#include
@@ -46,6 +46,7 @@
if(zend_hash_find(®(ht_rc), (char *) pattern, patlen+1, (void **)
&rc) == SUCCESS
&& rc->cflags == cflags) {
+#ifdef HAVE_REGEX_T_RE_MAGIC
/*
* We use a saved magic number to see whether cache is
corrupted, and if it
* is, we flush it and compile the pattern from scratch.
@@ -73,7 +74,20 @@
zend_hash_update(®(ht_rc), (char *) pattern, patlen+1,
(void *) &rcp, sizeof(rcp),
NULL);
}
-
+#else
+ memcpy(preg, &rc->preg, sizeof(*preg));
+ } else {
+ r = regcomp(preg, pattern, cflags);
+ if(!r) {
+ reg_cache rcp;
+
+ rcp.cflags = cflags;
+ memcpy(&rcp.preg, preg, sizeof(*preg));
+ zend_hash_update(®(ht_rc), (char *) pattern,
patlen+1,
+(void *) &rcp,
sizeof(rcp), NULL);
+ }
+ }
+#endif
return r;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
wez Mon Jul 18 13:41:34 2005 EDT Modified files: /CVSROOTavail Log: doc karma for the SDO team (gcc,cem,mfp,ansriniv) http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.997&r2=1.998&ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.997 CVSROOT/avail:1.998 --- CVSROOT/avail:1.997 Mon Jul 18 11:29:14 2005 +++ CVSROOT/avail Mon Jul 18 13:41:33 2005 @@ -32,7 +32,7 @@ # The PHP Documentation Group maintains the documentation and its # translations. -avail|jsgoupil,mazzanet,dbs,frogger,coldocean,alan_k,fleaslob,torben,lynch,kk,ted,paul,mbritton,coar,joey,bibi,mrobinso,perugini,tzwenny,hirokawa,drews,paulsen,hartmann,leon,jonen,tschuer,tfromm,manuel,stas,danbeck,sli,jmcastagnetto,mohrt,goba,samesch,jon,soneca,ronabop,glace,latoserver,rafael,jan,jcmeloni,chrullrich,mk,sebastian,troels,mathieu,phaethon,mj,corean,pandach,cycle98,vizvil,regina,cynic,jpm,dams,karoora,pcraft,suvia,zak,zimt,jmoore,ftfuture,ag315,bbonev,afortaleza,neotron,cg,delrom,jkj,hellekin,kgergely,cnewbill,fuzzy74,bjoern,fams,smasiello,dim,lucasr,cpereira,ernani,theseer,noribsd,subjective,ufux,hadar_p,asautins,dbenson,aleczapka,tom,amiller,cortesi,rarruda,betz,philip,alindeman,thyla,cucinato,zyprexia,tpug,mitja,conni,sts,georg,nmav,subbie,leszek,spheroid,slawek,alan_dangelo,ae,nohn,kaser01,visualmind,kurtz,luk,tronic,moh,bernd,yohgaki,fujimoto,gerzson,webler,spooky,cece,daniel,boo,nhoizey,joerg,imajes,hakan,chief977,shlomi,raful,yuval,tomer,barak,ido,mork,lior,gal,adiju,cr_depend,florian,kappu,muricaru,dt,critix,ck,costra,fancao0515,tibee,eriksson,wenz,bs,anderson,tal,sander,matroz,ave,adu,mmeier,wentzel,scaro,aspinei,lmaxcar,manuzhai,darvina,peter,maxim,romakhin,n0nick,attila,sagi,kai,microbrain,rhheo,shimi,k.schroeder,djworld,emil,lboshell,netholic,dmitry83,progcom,verdana,yincheng,surfmax,nicos,chregu,msopacua,bbd,cyril,gregory,hudzilla,klean,mignoni,wiesemann,xqi,mersal,zruya,sean,staybyte,aber_sabeel,alzahrani,thomaslio,sfox,jippie,antonio,ahxiao,akcakayaa,allhibi,aner,black,class007,digo,dima,dorons,eshare,hpop1,itay,juppie,mrmatrix,saad,thomasgm,xbite,tobsn,jome,analytik,outsider,heymarcel,asmodean,bader,elmaystro,sp,truelight,gnuhacker,_batman_,sachat,dallas,dejan,zer0fill,steve3d,lm92,bradmssw,tahani,victor,erica,simonh,phpman,mrphp,notarius,joseph,mmkhajah,mohammed,proton,klootz,takashima,leoca,ahmad,abobader,fboudot,wurm,hakawy,felix,ahmedss,mahrous2020,yorgo,gal_ga,abodive,ama,andras,hassen,jkhdk,okamura,popov,xman,fernandoc,avenger,hwin,tix,alrehawi_,liuming,ramysaweres,astone,shiflett,jaenecke,bdensley,adamchan,jingfs,murphy,potatotsang,the_q,jsheets,xelis,equerci,phpcatala,tofanini,umut,kriga,ray,royhuggins,logician,almanar,alexws,gonik,haiaw,lkwang_cn,shadowwulf,telecart,pongsakorn,naveed,shivas,tularis,angela,decorj,hitcho,kevinkee,nmee,thx1140,crotalus,didou,novotnyr,sil,traduim,gui,mgf,ivanr,michal,tsirman,momo,cysoft,firefox,kouber,mipac,muslem,tomysk,vemarkov,garth,lord_lele,stone,laacz,retnug,ernestyang,hatem,house,luisdaniel,nizar,nvivo,seth,tomh,danguer,adam,nio,wassago,beeven,colacino,zvaranka,cesarguru,chubu,dark2907,portoban,reven,wizzard,sywr,koendw83,rylin,webstudio,jsjohnst,dmanusset,et,pitiphan,mbr,cdalar,alrashoudi,hafid,enough,zhouhao007,jnorbi,lorenzohgh,denisr,coder03,jcclaros,thomas,freeman,rioter,jschultz,davey,belleto,jtacon,yuw,ohill,elfyn,noam,nathan,salman,cheezy,ene,rezaiqbal,purnomo,dufiga_php,ftp_geo,udhien,prio,luckyguy354,maf,handi,meme,satiri,maddankara,rildo,hd,ali,lpj,adhitama,engkongs,preilly,dave,marcelo,curt,fd,javi,mrmaster,fa,nlopess,vrana,apaxx,pjotrik,marduk,narcotia1234,enloma,trizo,xmadda,redshift,alifikri,coder,dodol_maniac,eflorin,adywarna,kyokpae,milans,lovchy,spermwhale,phaze,baoengb,derek,yannick,daan,xxiengb,ott,mg,kennyt,tomsommer,poz,zamolxe,bishmila,ph1,irchtml,rogamer,bortolini,sapfir,guru,ahmed,robinhood,sohli,amt,romain,hlecuanda,thessoro,nforbes,jolan,laze,bagilevi,young,shakaali,chokobo,portalufpa,teecee,blindman,holst,schst,mnv,sodhi,aidan,jellybob,lauer,shenkong,jad,robert,peterhuewe,ogre,techtonik,narigone,realtebo,krid,mclay,dasch,miwaniec,abdshomad,sammywg,aeoris,mez,jed,hsc,luckec,dmytton,choudesh,phpvcn|phpdoc,ZendAPI,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca +avail|gcc,cem,mfp,ansriniv,jsgoupil,mazzanet,dbs,frogger,coldocean,alan_k,fleaslob,torben,lynch,kk,ted,paul,mbritton,coar,joey,bibi,mrobinso,perugini,tzwenny,hirokawa,drews,paulsen,hartmann,leon,jonen,tschuer,tfromm,manuel,stas,danbeck,sli,jmcastagnetto,mohrt,goba,samesch,jon,soneca,ronabop,glace,latoserver,rafael,jan,jcmeloni,chrullrich,mk,sebastian,troels,mathieu,phaethon,mj,corean,pandach,cycle98,vizvil,regina,cynic,jpm,dams,karoora,pcraft,suvia,zak,zimt,jmoore,ftfuture,ag315,bbonev,afortale
Re: [PHP-CVS] cvs: php-src /ext/mcve mcve.c php_mcve.h
Maybe it's time to move ext/mcve to PECL, where you can safely add new
functions just before new PHP release?
On Mon, 18 Jul 2005 20:10:09 -
"Brad House" <[EMAIL PROTECTED]> wrote:
> bradmssw Mon Jul 18 16:10:09 2005 EDT
>
> Modified files:
> /php-src/ext/mcve mcve.c php_mcve.h
> Log:
> sync missing functions from libmonetra-5
>
> http://cvs.php.net/diff.php/php-src/ext/mcve/mcve.c?r1=1.32&r2=1.33&ty=u
> Index: php-src/ext/mcve/mcve.c
> diff -u php-src/ext/mcve/mcve.c:1.32 php-src/ext/mcve/mcve.c:1.33
> --- php-src/ext/mcve/mcve.c:1.32 Thu Jun 30 10:11:11 2005
> +++ php-src/ext/mcve/mcve.c Mon Jul 18 16:10:06 2005
> @@ -17,7 +17,7 @@
> +--+
> */
>
> -/* $Id: mcve.c,v 1.32 2005/06/30 14:11:11 sniper Exp $ */
> +/* $Id: mcve.c,v 1.33 2005/07/18 20:10:06 bradmssw Exp $ */
>
> #ifdef HAVE_CONFIG_H
> #include "config.h"
> @@ -60,6 +60,10 @@
> PHP_FE(m_setdropfile, NULL)
> PHP_FE(m_setip, NULL)
> PHP_FE(m_setssl,NULL)
> +#if LIBMONETRA_VERSION >= 05
> + PHP_FE(m_setssl_cafile, NULL)
> + PHP_FE(m_responsekeys, NULL)
> +#endif
> PHP_FE(m_setssl_files, NULL)
> PHP_FE(m_settimeout,NULL)
> PHP_FE(m_setblocking, NULL)
> @@ -734,6 +738,31 @@
> }
> /* }}} */
>
> +#if LIBMONETRA_VERSION >= 05
> +/* {{{ proto int m_setssl_cafile(resource conn, string cafile)
> + Set SSL CA (Certificate Authority) file for verification of server
> + certificate
> +*/
> +PHP_FUNCTION(m_setssl_cafile)
> +{
> + MCVE_CONN *conn;
> + int retval;
> + zval **arg1, **arg2;
> +
> + if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &arg1, &arg2) ==
> FAILURE)
> + WRONG_PARAM_COUNT;
> +
> +
> + ZEND_FETCH_RESOURCE(conn, MCVE_CONN *, arg1, -1, "mcve connection",
> le_conn);
> + convert_to_string_ex(arg2);
> +
> + retval = M_SetSSL_CAfile(conn, Z_STRVAL_PP(arg2));
> +
> + RETURN_LONG(retval);
> +}
> +/* }}} */
> +#endif
> +
> /* {{{ proto int m_setssl_files(resource conn, string sslkeyfile, string
> sslcertfile)
> Set certificate key files and certificates if server requires client
> certificate
> verification
> @@ -1150,6 +1179,36 @@
> }
> /* }}} */
>
> +#if LIBMONETRA_VERSION >= 05
> +/* {{{ proto array m_responsekeys(resource conn, long identifier)
> + Returns array of strings which represents the keys that can be used
> + for response parameters on this transaction
> +*/
> +PHP_FUNCTION(m_responsekeys)
> +{
> + MCVE_CONN *conn;
> + char **retval;
> + int num_keys, i;
> + zval **arg1, **arg2;
> +
> + if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &arg1, &arg2) ==
> FAILURE)
> + WRONG_PARAM_COUNT;
> +
> + ZEND_FETCH_RESOURCE(conn, MCVE_CONN *, arg1, -1, "mcve connection",
> le_conn);
> + convert_to_long_ex(arg2);
> +
> + array_init(return_value);
> +
> + retval=M_ResponseKeys(conn, Z_LVAL_PP(arg2), &num_keys);
> + if (retval != NULL) {
> + for (i=0; i + add_next_index_string(return_value, retval[i], 1);
> + M_FreeResponseKeys(retval, num_keys);
> + }
> +}
> +/* }}} */
> +#endif
> +
> /* {{{ proto string m_getuserparam(resource conn, long identifier, int key)
> Get a user response parameter */
> PHP_FUNCTION(m_getuserparam)
> http://cvs.php.net/diff.php/php-src/ext/mcve/php_mcve.h?r1=1.15&r2=1.16&ty=u
> Index: php-src/ext/mcve/php_mcve.h
> diff -u php-src/ext/mcve/php_mcve.h:1.15 php-src/ext/mcve/php_mcve.h:1.16
> --- php-src/ext/mcve/php_mcve.h:1.15 Mon Jun 6 12:43:23 2005
> +++ php-src/ext/mcve/php_mcve.h Mon Jul 18 16:10:06 2005
> @@ -16,7 +16,7 @@
> | Chris Faulhaber <[EMAIL PROTECTED]>
> |
> +--+
> */
> -/* $Id: php_mcve.h,v 1.15 2005/06/06 16:43:23 bradmssw Exp $ */
> +/* $Id: php_mcve.h,v 1.16 2005/07/18 20:10:06 bradmssw Exp $ */
>
> #ifndef _PHP_MCVE_H
> #define _PHP_MCVE_H
> @@ -51,6 +51,10 @@
> PHP_FUNCTION(m_setdropfile);
> PHP_FUNCTION(m_setip);
> PHP_FUNCTION(m_setssl);
> +#if LIBMONETRA_VERSION >= 05
> +PHP_FUNCTION(m_setssl_cafile);
> +PHP_FUNCTION(m_responsekeys);
> +#endif
> PHP_FUNCTION(m_setssl_files);
> PHP_FUNCTION(m_setblocking);
> PHP_FUNCTION(m_settimeout);
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>
>
--
Wbr,
Antony Dovgal
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard reg.c
sniper Mon Jul 18 19:10:10 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/standard reg.c
Log:
MFB4_4: Fix compile problem with --regex=system on some systems
http://cvs.php.net/diff.php/php-src/ext/standard/reg.c?r1=1.78.2.1&r2=1.78.2.2&ty=u
Index: php-src/ext/standard/reg.c
diff -u php-src/ext/standard/reg.c:1.78.2.1 php-src/ext/standard/reg.c:1.78.2.2
--- php-src/ext/standard/reg.c:1.78.2.1 Thu May 26 17:49:32 2005
+++ php-src/ext/standard/reg.c Mon Jul 18 19:10:08 2005
@@ -17,7 +17,7 @@
| Jaakko Hyvätti <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: reg.c,v 1.78.2.1 2005/05/26 21:49:32 andrei Exp $ */
+/* $Id: reg.c,v 1.78.2.2 2005/07/18 23:10:08 sniper Exp $ */
#include
#include
@@ -46,6 +46,7 @@
if(zend_hash_find(®(ht_rc), (char *) pattern, patlen+1, (void **)
&rc) == SUCCESS
&& rc->cflags == cflags) {
+#ifdef HAVE_REGEX_T_RE_MAGIC
/*
* We use a saved magic number to see whether cache is
corrupted, and if it
* is, we flush it and compile the pattern from scratch.
@@ -73,7 +74,20 @@
zend_hash_update(®(ht_rc), (char *) pattern, patlen+1,
(void *) &rcp, sizeof(rcp),
NULL);
}
-
+#else
+ memcpy(preg, &rc->preg, sizeof(*preg));
+ } else {
+ r = regcomp(preg, pattern, cflags);
+ if(!r) {
+ reg_cache rcp;
+
+ rcp.cflags = cflags;
+ memcpy(&rcp.preg, preg, sizeof(*preg));
+ zend_hash_update(®(ht_rc), (char *) pattern,
patlen+1,
+(void *) &rcp,
sizeof(rcp), NULL);
+ }
+ }
+#endif
return r;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/xml/tests bug26614.phpt bug26614_libxml.phpt
Hello Adam, sorry i don't have any additional testcases but take your time and count the bytes and columns in the testcase yourself. You'll find out that they are worthless. regards marcus and yes i know how fast Daniel is and therefore looked into the code myself but couldn't find a mistake in the lib code, so basically i gave up. Monday, July 18, 2005, 9:45:23 AM, you wrote: > In-Reply-To: <[EMAIL PROTECTED]> > Message-ID: <[EMAIL PROTECTED]> > References: <[EMAIL PROTECTED]> > MIME-Version: 1.0 > Content-Type: TEXT/PLAIN; charset=US-ASCII > On Sun, 17 Jul 2005, Marcus Boerger wrote: >> Log: >> - If you ask me both (expat and libxml) are not really accurate about byte >> positions and columns...however the line number information is now >> correct for both so for the moment we live with the situation that they >> return different byte and column information. > Hello -- > Can you provide test cases for this? > Daniel with libxml2 is usually pretty good at either fixing a bug when > he can reproduce it, or providing a strong justification for why he > thinks the libxml2 behavior is correct. :) > Rob has already filted back a bunch of fixes and reports we get > through the bug system. > I would rather us get this fixed downstream than dealing with it in > PHP. > -adam > -- > [EMAIL PROTECTED] | http://www.trachtenberg.com > author of o'reilly's "upgrading to php 5" and "php cookbook" > avoid the holiday rush, buy your copies today! -- Best regards, Marcusmailto:[EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard reg.c
sniper Mon Jul 18 19:17:26 2005 EDT
Modified files:
/php-src/ext/standard reg.c
Log:
MFB4_4: Fix compile problem with --regex=system on some systems
http://cvs.php.net/diff.php/php-src/ext/standard/reg.c?r1=1.80&r2=1.81&ty=u
Index: php-src/ext/standard/reg.c
diff -u php-src/ext/standard/reg.c:1.80 php-src/ext/standard/reg.c:1.81
--- php-src/ext/standard/reg.c:1.80 Thu May 26 17:48:35 2005
+++ php-src/ext/standard/reg.c Mon Jul 18 19:17:24 2005
@@ -17,7 +17,7 @@
| Jaakko Hyvätti <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: reg.c,v 1.80 2005/05/26 21:48:35 andrei Exp $ */
+/* $Id: reg.c,v 1.81 2005/07/18 23:17:24 sniper Exp $ */
#include
#include
@@ -46,6 +46,7 @@
if(zend_hash_find(®(ht_rc), (char *) pattern, patlen+1, (void **)
&rc) == SUCCESS
&& rc->cflags == cflags) {
+#ifdef HAVE_REGEX_T_RE_MAGIC
/*
* We use a saved magic number to see whether cache is
corrupted, and if it
* is, we flush it and compile the pattern from scratch.
@@ -73,7 +74,20 @@
zend_hash_update(®(ht_rc), (char *) pattern, patlen+1,
(void *) &rcp, sizeof(rcp),
NULL);
}
-
+#else
+ memcpy(preg, &rc->preg, sizeof(*preg));
+ } else {
+ r = regcomp(preg, pattern, cflags);
+ if(!r) {
+ reg_cache rcp;
+
+ rcp.cflags = cflags;
+ memcpy(&rcp.preg, preg, sizeof(*preg));
+ zend_hash_update(®(ht_rc), (char *) pattern,
patlen+1,
+(void *) &rcp,
sizeof(rcp), NULL);
+ }
+ }
+#endif
return r;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) / acinclude.m4
sniper Mon Jul 18 14:39:12 2005 EDT Modified files: (Branch: PHP_4_4) /php-srcacinclude.m4 Log: MFH http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.218.2.50.2.2&r2=1.218.2.50.2.3&ty=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.218.2.50.2.2 php-src/acinclude.m4:1.218.2.50.2.3 --- php-src/acinclude.m4:1.218.2.50.2.2 Wed Jul 13 20:16:43 2005 +++ php-src/acinclude.m4Mon Jul 18 14:39:12 2005 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.218.2.50.2.2 2005/07/14 00:16:43 sniper Exp $ -*- autoconf -*- +dnl $Id: acinclude.m4,v 1.218.2.50.2.3 2005/07/18 18:39:12 sniper Exp $ -*- autoconf -*- dnl dnl This file contains local autoconf functions. @@ -1102,7 +1102,7 @@ dnl Check if field re_magic exists in struct regex_t AC_CACHE_CHECK([whether field re_magic exists in struct regex_t], ac_cv_regex_t_re_magic, [ AC_TRY_COMPILE([#include -#include ], [struct regex_t rt; rt.re_magic;], +#include ], [regex_t rt; rt.re_magic;], [ac_cv_regex_t_re_magic=yes], [ac_cv_regex_t_re_magic=no]) ]) if test "$ac_cv_regex_t_re_magic" = "yes"; then -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / acinclude.m4
sniper Mon Jul 18 14:39:37 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcacinclude.m4 Log: MFH http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.271.2.20&r2=1.271.2.21&ty=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.271.2.20 php-src/acinclude.m4:1.271.2.21 --- php-src/acinclude.m4:1.271.2.20 Wed Jul 13 20:15:35 2005 +++ php-src/acinclude.m4Mon Jul 18 14:39:37 2005 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.271.2.20 2005/07/14 00:15:35 sniper Exp $ -*- autoconf -*- +dnl $Id: acinclude.m4,v 1.271.2.21 2005/07/18 18:39:37 sniper Exp $ -*- autoconf -*- dnl dnl This file contains local autoconf functions. @@ -1101,7 +1101,7 @@ dnl Check if field re_magic exists in struct regex_t AC_CACHE_CHECK([whether field re_magic exists in struct regex_t], ac_cv_regex_t_re_magic, [ AC_TRY_COMPILE([#include -#include ], [struct regex_t rt; rt.re_magic;], +#include ], [regex_t rt; rt.re_magic;], [ac_cv_regex_t_re_magic=yes], [ac_cv_regex_t_re_magic=no]) ]) if test "$ac_cv_regex_t_re_magic" = "yes"; then -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /main php_variables.c
iliaa Mon Jul 18 15:18:03 2005 EDT Modified files: /php-src/main php_variables.c /php-srcNEWS Log: Revert cookie patch for BC reasons. http://cvs.php.net/diff.php/php-src/main/php_variables.c?r1=1.97&r2=1.98&ty=u Index: php-src/main/php_variables.c diff -u php-src/main/php_variables.c:1.97 php-src/main/php_variables.c:1.98 --- php-src/main/php_variables.c:1.97 Mon Jul 18 00:04:18 2005 +++ php-src/main/php_variables.cMon Jul 18 15:18:03 2005 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php_variables.c,v 1.97 2005/07/18 04:04:18 iliaa Exp $ */ +/* $Id: php_variables.c,v 1.98 2005/07/18 19:18:03 iliaa Exp $ */ #include #include "php.h" @@ -317,8 +317,7 @@ separator = (char *) estrdup(PG(arg_separator).input); break; case PARSE_COOKIE: - /* The , and space are needed for instances when there are multiple Cookie: headers */ - separator = ";, \0"; + separator = ";\0"; break; } http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1999&r2=1.2000&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1999 php-src/NEWS:1.2000 --- php-src/NEWS:1.1999 Mon Jul 18 03:13:31 2005 +++ php-src/NEWSMon Jul 18 15:18:03 2005 @@ -1,7 +1,6 @@ PHPNEWS ||| ?? ??? 2005, PHP 5.1 -- Fixed handling of HTTP requests with multiple Cookie headers. (Ilia) - Fixed bug #33558 (warning with nested calls to functions returning by reference). (Dmitry) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /main php_variables.c
iliaa Mon Jul 18 15:18:29 2005 EDT Modified files: (Branch: PHP_4_4) /php-src/main php_variables.c Log: MFH: revert http://cvs.php.net/diff.php/php-src/main/php_variables.c?r1=1.45.2.13.2.1&r2=1.45.2.13.2.2&ty=u Index: php-src/main/php_variables.c diff -u php-src/main/php_variables.c:1.45.2.13.2.1 php-src/main/php_variables.c:1.45.2.13.2.2 --- php-src/main/php_variables.c:1.45.2.13.2.1 Mon Jul 18 00:04:43 2005 +++ php-src/main/php_variables.cMon Jul 18 15:18:29 2005 @@ -16,7 +16,7 @@ | Zeev Suraski <[EMAIL PROTECTED]>| +--+ */ -/* $Id: php_variables.c,v 1.45.2.13.2.1 2005/07/18 04:04:43 iliaa Exp $ */ +/* $Id: php_variables.c,v 1.45.2.13.2.2 2005/07/18 19:18:29 iliaa Exp $ */ #include #include "php.h" @@ -304,8 +304,7 @@ separator = (char *) estrdup(PG(arg_separator).input); break; case PARSE_COOKIE: - /* The , and space are needed for instances when there are multiple Cookie: headers */ - separator = ";, \0"; + separator = ";\0"; break; } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mcve mcve.c php_mcve.h
Brad, In any case, we are in a complete feature freeze right now. I sent an email about this to [EMAIL PROTECTED] Only bug fixes allowed. Please #if BRAD_0 that code in HEAD. I don't see a problem allowing the addition of such simple wrapper functions after 5.1.0 goes out the door; but I don't want such code changes at this point. Andi At 12:54 AM 7/19/2005 +0400, Antony Dovgal wrote: On Mon, 18 Jul 2005 16:34:44 -0400 Brad House <[EMAIL PROTECTED]> wrote: > Perhaps. There was discussion once upon a time along those lines, > but nothing else came of it. I'd have to know what it entails, > and if it would prohibit the extension from being distributed > with the main PHP codebase. AFAIK the general plan is to move almost all extensions to PECL (and we're working on it, take a look on how many extensions were moved there in 5.0 and 5.1), so users would be able to get & install only extensions they really need. Personally I don't think that ext/mcve is used by large number of users (I haven't ever heard of someone using it) and IMO that's a perfect reason to move it from the core to PECL. I can be wrong, though. There are also several rather important reasons to do so: 1) you wouldn't depend on PHP release cycles. 2) you would be able to use PECL infrastructure to build Win32 *.dll's 3) Others. All this doesn't mean that users will not be able to install/use the extension or even have some problems with it. Extensions from PECL can be installed with this command: # pear install extname See details here: http://www.php.net/manual/en/install.pecl.php > Forgive my ignorance, but I have > not even looked into what PECL really is. Well, I'd recommend to take a look on it, since you're the maintainer of an extension.. -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mcve mcve.c php_mcve.h
bradmsswMon Jul 18 20:34:39 2005 EDT
Modified files:
/php-src/ext/mcve mcve.c php_mcve.h
Log:
\#if BRAD_0'd latest changes as requested until 5.1.0 release
http://cvs.php.net/diff.php/php-src/ext/mcve/mcve.c?r1=1.33&r2=1.34&ty=u
Index: php-src/ext/mcve/mcve.c
diff -u php-src/ext/mcve/mcve.c:1.33 php-src/ext/mcve/mcve.c:1.34
--- php-src/ext/mcve/mcve.c:1.33Mon Jul 18 16:10:06 2005
+++ php-src/ext/mcve/mcve.c Mon Jul 18 20:34:38 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mcve.c,v 1.33 2005/07/18 20:10:06 bradmssw Exp $ */
+/* $Id: mcve.c,v 1.34 2005/07/19 00:34:38 bradmssw Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -60,10 +60,12 @@
PHP_FE(m_setdropfile, NULL)
PHP_FE(m_setip, NULL)
PHP_FE(m_setssl,NULL)
+#if BRAD_0
#if LIBMONETRA_VERSION >= 05
PHP_FE(m_setssl_cafile, NULL)
PHP_FE(m_responsekeys, NULL)
#endif
+#endif
PHP_FE(m_setssl_files, NULL)
PHP_FE(m_settimeout,NULL)
PHP_FE(m_setblocking, NULL)
@@ -738,6 +740,7 @@
}
/* }}} */
+#if BRAD_0
#if LIBMONETRA_VERSION >= 05
/* {{{ proto int m_setssl_cafile(resource conn, string cafile)
Set SSL CA (Certificate Authority) file for verification of server
@@ -762,6 +765,7 @@
}
/* }}} */
#endif
+#endif
/* {{{ proto int m_setssl_files(resource conn, string sslkeyfile, string
sslcertfile)
Set certificate key files and certificates if server requires client
certificate
@@ -1179,6 +1183,7 @@
}
/* }}} */
+#if BRAD_0
#if LIBMONETRA_VERSION >= 05
/* {{{ proto array m_responsekeys(resource conn, long identifier)
Returns array of strings which represents the keys that can be used
@@ -1208,6 +1213,7 @@
}
/* }}} */
#endif
+#endif
/* {{{ proto string m_getuserparam(resource conn, long identifier, int key)
Get a user response parameter */
http://cvs.php.net/diff.php/php-src/ext/mcve/php_mcve.h?r1=1.16&r2=1.17&ty=u
Index: php-src/ext/mcve/php_mcve.h
diff -u php-src/ext/mcve/php_mcve.h:1.16 php-src/ext/mcve/php_mcve.h:1.17
--- php-src/ext/mcve/php_mcve.h:1.16Mon Jul 18 16:10:06 2005
+++ php-src/ext/mcve/php_mcve.h Mon Jul 18 20:34:38 2005
@@ -16,7 +16,7 @@
| Chris Faulhaber <[EMAIL PROTECTED]>|
+--+
*/
-/* $Id: php_mcve.h,v 1.16 2005/07/18 20:10:06 bradmssw Exp $ */
+/* $Id: php_mcve.h,v 1.17 2005/07/19 00:34:38 bradmssw Exp $ */
#ifndef _PHP_MCVE_H
#define _PHP_MCVE_H
@@ -51,10 +51,12 @@
PHP_FUNCTION(m_setdropfile);
PHP_FUNCTION(m_setip);
PHP_FUNCTION(m_setssl);
+#if BRAD_0
#if LIBMONETRA_VERSION >= 05
PHP_FUNCTION(m_setssl_cafile);
PHP_FUNCTION(m_responsekeys);
#endif
+#endif
PHP_FUNCTION(m_setssl_files);
PHP_FUNCTION(m_setblocking);
PHP_FUNCTION(m_settimeout);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mcve mcve.c php_mcve.h
Andi, Sorry about that, I haven't been paying much attention to the internals@ list, I'll make sure I check the list before committing next time. I have #if BRAD_0'd the code, and will remove those #if's after 5.1.0 release. -Brad Andi Gutmans wrote: > Brad, > > In any case, we are in a complete feature freeze right now. I sent an > email about this to [EMAIL PROTECTED] Only bug fixes allowed. Please #if > BRAD_0 that code in HEAD. I don't see a problem allowing the addition > of such simple wrapper functions after 5.1.0 goes out the door; but I > don't want such code changes at this point. > > Andi > > At 12:54 AM 7/19/2005 +0400, Antony Dovgal wrote: > >> On Mon, 18 Jul 2005 16:34:44 -0400 >> Brad House <[EMAIL PROTECTED]> wrote: >> >> > Perhaps. There was discussion once upon a time along those lines, >> > but nothing else came of it. I'd have to know what it entails, >> > and if it would prohibit the extension from being distributed >> > with the main PHP codebase. >> >> AFAIK the general plan is to move almost all extensions to PECL >> (and we're working on it, take a look on how many extensions were moved >> there in 5.0 and 5.1), so users would be able to get & install only >> extensions they really need. >> >> Personally I don't think that ext/mcve is used by large number of users >> (I haven't ever heard of someone using it) and IMO that's a perfect >> reason >> to move it from the core to PECL. >> I can be wrong, though. >> >> There are also several rather important reasons to do so: >> 1) you wouldn't depend on PHP release cycles. >> 2) you would be able to use PECL infrastructure to build Win32 *.dll's >> 3) Others. >> >> All this doesn't mean that users will not be able to install/use the >> extension >> or even have some problems with it. Extensions from PECL can be >> installed with this command: >> # pear install extname >> See details here: http://www.php.net/manual/en/install.pecl.php >> >> > Forgive my ignorance, but I have >> > not even looked into what PECL really is. >> >> Well, I'd recommend to take a look on it, since you're the maintainer >> of an extension.. >> >> -- >> Wbr, >> Antony Dovgal >> >> -- >> PHP CVS Mailing List (http://www.php.net/) >> To unsubscribe, visit: http://www.php.net/unsub.php > > > -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo_odbc odbc_stmt.c
wez Mon Jul 18 23:39:50 2005 EDT
Modified files:
/php-src/ext/pdo_odbc odbc_stmt.c
Log:
Limit the size of columns to 64K, so we don't try to allocate 2GB for each
text
column coming out of informix.
Refs Bug #33533.
Not totally closed yet; still need to cater for text fields longer than 64k
in a sane manner.
http://cvs.php.net/diff.php/php-src/ext/pdo_odbc/odbc_stmt.c?r1=1.23&r2=1.24&ty=u
Index: php-src/ext/pdo_odbc/odbc_stmt.c
diff -u php-src/ext/pdo_odbc/odbc_stmt.c:1.23
php-src/ext/pdo_odbc/odbc_stmt.c:1.24
--- php-src/ext/pdo_odbc/odbc_stmt.c:1.23 Sat Jul 9 01:01:14 2005
+++ php-src/ext/pdo_odbc/odbc_stmt.cMon Jul 18 23:39:49 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: odbc_stmt.c,v 1.23 2005/07/09 05:01:14 wez Exp $ */
+/* $Id: odbc_stmt.c,v 1.24 2005/07/19 03:39:49 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -386,6 +386,12 @@
return 0;
}
+ /* enforce a practical limitation.
+* TODO: make this work more nicely */
+ if (colsize > 65535) {
+ colsize = 65535;
+ }
+
col->maxlen = S->cols[colno].datalen = colsize;
col->namelen = colnamelen;
col->name = estrdup(S->cols[colno].colname);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
