[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Tue Feb 18 20:32:10 2003 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.176 ZendEngine2/ChangeLog:1.177 --- ZendEngine2/ChangeLog:1.176 Mon Feb 17 20:34:00 2003 +++ ZendEngine2/ChangeLog Tue Feb 18 20:32:10 2003 @@ -1,3 +1,40 @@ +2003-02-18 Rasmus Lerdorf [EMAIL PROTECTED] + +* zend_stream.c: + fileno() needs a FILE * here, and at least on FreeBSD with gcc-2.95.3 + it is unable to figure out that this is indeed a FILE * and hence it + won't compile without this cast. + +2003-02-18 Zeev Suraski [EMAIL PROTECTED] + +* zend.h + zend_compile.c + zend_compile.h + zend_execute.c + zend_language_scanner.l + zend_opcode.c: + Avoid using a C++ reserved word + +2003-02-18 Wez Furlong [EMAIL PROTECTED] + +* ZendTS.dsp + flex.skl: + Fixup build for win32 + +* Makefile.am + flex.skl + zend.c + zend.h + zend_compile.h + zend_execute.c + zend_globals.h + zend_ini_scanner.l + zend_language_scanner.h + zend_language_scanner.l + zend_stream.c + zend_stream.h: + Implement simple stream support in the ZE scanners. + 2003-02-17 Zeev Suraski [EMAIL PROTECTED] * zend_language_parser.y: @@ -416,7 +453,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.176 2003/02/18 01:34:00 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.177 2003/02/19 01:32:10 changelog +Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS-DAILY] cvs: php4 / NEWS
changelog Tue Feb 18 20:32:20 2003 EDT Modified files: /php4 NEWS Log: NEWS update Index: php4/NEWS diff -u php4/NEWS:1.1344 php4/NEWS:1.1345 --- php4/NEWS:1.1344Tue Feb 18 15:34:35 2003 +++ php4/NEWS Tue Feb 18 20:32:20 2003 @@ -1,6 +1,8 @@ PHP 4 NEWS ||| ? ? ??? 200?, Version 5.0.0 +- Added new parameter to sha1() and md5() which return the digest as + binary data. (Michael Bretterklieber [EMAIL PROTECTED], Derick) - Added proc_nice() function, which allows changing priority of the current process. (Ilia) - Added pcntl_getpriority() and pcntl_setpriority() functions, which can be
[PHP-CVS] cvs: php4 /ext/mysqli mysqli_api.c mysqli_fe.c php_mysqli.h
georg Tue Feb 18 03:49:00 2003 EDT
Modified files:
/php4/ext/mysqliphp_mysqli.h mysqli_api.c mysqli_fe.c
Log:
added new function mysqli_stmt_store_result
Index: php4/ext/mysqli/php_mysqli.h
diff -u php4/ext/mysqli/php_mysqli.h:1.8 php4/ext/mysqli/php_mysqli.h:1.9
--- php4/ext/mysqli/php_mysqli.h:1.8Sun Feb 16 10:56:57 2003
+++ php4/ext/mysqli/php_mysqli.hTue Feb 18 03:49:00 2003
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: php_mysqli.h,v 1.8 2003/02/16 15:56:57 iliaa Exp $
+ $Id: php_mysqli.h,v 1.9 2003/02/18 08:49:00 georg Exp $
*/
/* A little hack to prevent build break, when mysql is used together with
@@ -231,6 +231,7 @@
PHP_FUNCTION(mysqli_stmt_close);
PHP_FUNCTION(mysqli_stmt_errno);
PHP_FUNCTION(mysqli_stmt_error);
+PHP_FUNCTION(mysqli_stmt_store_result);
PHP_FUNCTION(mysqli_store_result);
PHP_FUNCTION(mysqli_thread_id);
PHP_FUNCTION(mysqli_thread_safe);
Index: php4/ext/mysqli/mysqli_api.c
diff -u php4/ext/mysqli/mysqli_api.c:1.14 php4/ext/mysqli/mysqli_api.c:1.15
--- php4/ext/mysqli/mysqli_api.c:1.14 Mon Feb 17 22:12:38 2003
+++ php4/ext/mysqli/mysqli_api.cTue Feb 18 03:49:00 2003
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_api.c,v 1.14 2003/02/18 03:12:38 iliaa Exp $
+ $Id: mysqli_api.c,v 1.15 2003/02/18 08:49:00 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1630,8 +1630,27 @@
}
/* }}} */
+/* {{{ bool resource mysqli_stmt_store_result(stmt)
+*/
+PHP_FUNCTION(mysqli_stmt_store_result)
+{
+ STMT *stmt;
+ zval *mysql_stmt;
+
+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), O,
+mysql_stmt, mysqli_stmt_class_entry) == FAILURE) {
+ return;
+ }
+ MYSQLI_FETCH_RESOURCE(stmt, STMT *, mysql_stmt, mysqli_stmt);
+
+ if (mysql_stmt_store_result(stmt-stmt)){
+ RETURN_FALSE;
+ }
+ RETURN_TRUE;
+}
+/* }}} */
/* {{{ proto int mysqli_thread_id(resource link)
*/
+
PHP_FUNCTION(mysqli_thread_id)
{
MYSQL *mysql;
Index: php4/ext/mysqli/mysqli_fe.c
diff -u php4/ext/mysqli/mysqli_fe.c:1.6 php4/ext/mysqli/mysqli_fe.c:1.7
--- php4/ext/mysqli/mysqli_fe.c:1.6 Mon Feb 17 04:38:32 2003
+++ php4/ext/mysqli/mysqli_fe.c Tue Feb 18 03:49:00 2003
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_fe.c,v 1.6 2003/02/17 09:38:32 georg Exp $
+ $Id: mysqli_fe.c,v 1.7 2003/02/18 08:49:00 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -110,6 +110,7 @@
PHP_FE(mysqli_stmt_errno,
NULL)
PHP_FE(mysqli_stmt_error,
NULL)
PHP_FE(mysqli_store_result,
NULL)
+ PHP_FE(mysqli_stmt_store_result,NULL)
PHP_FE(mysqli_thread_id,
NULL)
PHP_FE(mysqli_thread_safe,
NULL)
PHP_FE(mysqli_use_result,
NULL)
@@ -207,13 +208,14 @@
* Every user visible function must have an entry in mysqli_stmt_functions[].
*/
function_entry mysqli_stmt_methods[] = {
+ PHP_FALIAS(affected_rows,mysqli_stmt_affected_rows,NULL)
PHP_FALIAS(bind_param,mysqli_bind_param,NULL)
PHP_FALIAS(bind_result,mysqli_bind_result,NULL)
PHP_FALIAS(execute,mysqli_execute,NULL)
PHP_FALIAS(fetch,mysqli_fetch,NULL)
PHP_FALIAS(param_count,mysqli_param_count,NULL)
PHP_FALIAS(send_long_data,mysqli_send_long_data,NULL)
- PHP_FALIAS(affected_rows,mysqli_stmt_affected_rows,NULL)
+ PHP_FALIAS(store_result,mysqli_stmt_store_result,NULL)
PHP_FALIAS(close,mysqli_stmt_close,NULL)
PHP_FALIAS(errno,mysqli_stmt_errno,NULL)
PHP_FALIAS(error,mysqli_stmt_error,NULL)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
zeevTue Feb 18 04:14:32 2003 EDT Modified files: /CVSROOTavail Log: Add ZE karma to Wez Index: CVSROOT/avail diff -u CVSROOT/avail:1.594 CVSROOT/avail:1.595 --- CVSROOT/avail:1.594 Wed Feb 12 18:03:24 2003 +++ CVSROOT/avail Tue Feb 18 04:14:31 2003 @@ -21,7 +21,7 @@ # People who work on the Engine -avail|andi,zeev,andrei,stas,sterling,sascha,derick,sebastian,phanto,sniper,hirokawa,fujimoto,dali,rvenkat,imajes,jason,sesser,kalowsky,jmoore,iliaa,dreid,hyanantha,georg|Zend,ZendEngine2,TSRM +avail|andi,zeev,andrei,stas,sterling,sascha,derick,sebastian,phanto,sniper,hirokawa,fujimoto,dali,rvenkat,imajes,jason,sesser,kalowsky,jmoore,iliaa,dreid,hyanantha,georg,wez|Zend,ZendEngine2,TSRM # The PHP Documentation Group maintains the documentation and its # translations. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / configure.in /ext/standard basic_functions.c /main main.c php_ini.c ZendEngine2 Makefile.am flex.skl zend.c zend.h zend_compile.h zend_execute.c zend_globals.h zend_ini_scanner.l zend_language_scanner.h zend_language_scanner.l zend_stream.c zend_stream.h
wez Tue Feb 18 04:37:55 2003 EDT
Added files:
/ZendEngine2zend_stream.c zend_stream.h
Modified files:
/php4 configure.in
/php4/ext/standard basic_functions.c
/ZendEngine2Makefile.am flex.skl zend.c zend.h zend_compile.h
zend_execute.c zend_globals.h zend_ini_scanner.l
zend_language_scanner.h zend_language_scanner.l
/php4/main main.c php_ini.c
Log:
Implement simple stream support in the ZE scanners.
Index: php4/configure.in
diff -u php4/configure.in:1.422 php4/configure.in:1.423
--- php4/configure.in:1.422 Sun Feb 16 17:19:28 2003
+++ php4/configure.in Tue Feb 18 04:37:51 2003
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.422 2003/02/16 22:19:28 wez Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.423 2003/02/18 09:37:51 wez Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -1116,7 +1116,7 @@
zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
-zend_ini.c zend_qsort.c zend_multibyte.c)
+zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c zend_stream.c)
if test -r $abs_srcdir/Zend/zend_objects.c; then
PHP_ADD_SOURCES(Zend, zend_objects.c zend_object_handlers.c zend_objects_API.c
zend_mm.c)
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.582
php4/ext/standard/basic_functions.c:1.583
--- php4/ext/standard/basic_functions.c:1.582 Mon Feb 17 20:23:51 2003
+++ php4/ext/standard/basic_functions.c Tue Feb 18 04:37:52 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.582 2003/02/18 01:23:51 iliaa Exp $ */
+/* $Id: basic_functions.c,v 1.583 2003/02/18 09:37:52 wez Exp $ */
#include php.h
#include php_streams.h
@@ -2941,21 +2941,10 @@
convert_to_string_ex(filename);
- if (PG(safe_mode) (!php_checkuid(Z_STRVAL_PP(filename), NULL,
CHECKUID_ALLOW_ONLY_FILE))) {
- RETURN_FALSE;
- }
-
- if (php_check_open_basedir(Z_STRVAL_PP(filename) TSRMLS_CC)) {
- RETURN_FALSE;
- }
-
- fh.handle.fp = VCWD_FOPEN(Z_STRVAL_PP(filename), r);
- if (!fh.handle.fp) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot open '%s' for
reading, Z_STRVAL_PP(filename));
- RETURN_FALSE;
- }
- Z_TYPE(fh) = ZEND_HANDLE_FP;
+ memset(fh, 0, sizeof(fh));
fh.filename = Z_STRVAL_PP(filename);
+ Z_TYPE(fh) = ZEND_HANDLE_FILENAME;
+
array_init(return_value);
zend_parse_ini_file(fh, 0, ini_parser_cb, return_value);
}
Index: ZendEngine2/Makefile.am
diff -u ZendEngine2/Makefile.am:1.49 ZendEngine2/Makefile.am:1.50
--- ZendEngine2/Makefile.am:1.49Fri Feb 14 07:05:16 2003
+++ ZendEngine2/Makefile.am Tue Feb 18 04:37:53 2003
@@ -14,7 +14,7 @@
zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
zend_ini.c zend_qsort.c zend_objects.c zend_object_handlers.c \
- zend_object_API.c
+ zend_object_API.c zend_ts_hash.c zend_stream.c
libZend_la_LDFLAGS =
libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
Index: ZendEngine2/flex.skl
diff -u ZendEngine2/flex.skl:1.28 ZendEngine2/flex.skl:1.29
--- ZendEngine2/flex.skl:1.28 Wed Aug 14 20:25:27 2002
+++ ZendEngine2/flex.sklTue Feb 18 04:37:53 2003
@@ -1,7 +1,8 @@
/* A Lexical scanner generated by flex */
/* Scanner skeleton version:
- * $Header: /usr/repository/ZendEngine2/flex.skl,v 1.28 2002/08/15 00:25:27 zeev Exp $
+ * $Header: /usr/repository/ZendEngine2/flex.skl,v 1.29 2003/02/18 09:37:53 wez Exp $
+ * vim:ft=lex:
*/
#define FLEX_SCANNER
@@ -154,7 +155,7 @@
struct yy_buffer_state
{
%-
- FILE *yy_input_file;
+ struct _zend_file_handle *yy_input_file;
%+
istream* yy_input_file;
%*
@@ -256,13 +257,13 @@
/* static int yy_did_buffer_switch_on_eof; */
#define yy_did_buffer_switch_on_eof SCNG(_yy_did_buffer_switch_on_eof)
-void yyrestart YY_PROTO(( FILE *input_file TSRMLS_DC ));
+void yyrestart YY_PROTO(( struct _zend_file_handle *input_file TSRMLS_DC ));
void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer TSRMLS_DC ));
void yy_load_buffer_state YY_PROTO(( TSRMLS_D ));
-YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size TSRMLS_DC ));
+YY_BUFFER_STATE yy_create_buffer YY_PROTO(( struct _zend_file_handle *file, int size
+TSRMLS_DC ));
void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b TSRMLS_DC ));
-void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file TSRMLS_DC ));
+void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, struct
[PHP-CVS] Re: confirm unsubscribe from php-cvs@lists.php.net
- Original Message - From: [EMAIL PROTECTED] Sent: 18 Feb 2003 14:15:00 - To: [EMAIL PROTECTED] Subject: confirm unsubscribe from [EMAIL PROTECTED] Hi! This is the ezmlm program. I'm managing the [EMAIL PROTECTED] mailing list. I'm working for my owner, who can be reached at [EMAIL PROTECTED] To confirm that you would like [EMAIL PROTECTED] removed from the php-cvs mailing list, please send an empty reply to this address: [EMAIL PROTECTED] Usually, this happens when you just hit the reply button. If this does not work, simply copy the address and paste it into the To: field of a new message. or click here: mailto:[EMAIL PROTECTED] I haven't checked whether your address is currently on the mailing list. To see what address you used to subscribe, look at the messages you are receiving from the mailing list. Each message has your address hidden inside its return path; for example, [EMAIL PROTECTED] receives messages with return path: php-cvs-return-number[EMAIL PROTECTED] Some mail programs are broken and cannot handle long addresses. If you cannot reply to this request, instead send a message to [EMAIL PROTECTED] and put the entire address listed above into the Subject: line. --- Administrative commands for the php-cvs list --- I can handle administrative requests automatically. Please do not send them to the list address! Instead, send your message to the correct command address: For help and a description of available commands, send a message to: [EMAIL PROTECTED] To subscribe to the list, send a message to: [EMAIL PROTECTED] To remove your address from the list, just send a message to the address in the ``List-Unsubscribe'' header of any list message. If you haven't changed addresses since subscribing, you can also send a message to: [EMAIL PROTECTED] or for the digest to: [EMAIL PROTECTED] For addition or removal of addresses, I'll send a confirmation message to that address. When you receive it, simply reply to it to complete the transaction. If you need to get in touch with the human owner of this list, please send a message to: [EMAIL PROTECTED] Please include a FORWARDED list message with ALL HEADERS intact to make it easier to help you. --- Enclosed is a copy of the request I received. Return-Path: [EMAIL PROTECTED] Received: (qmail 37769 invoked from network); 18 Feb 2003 14:14:59 - Received: from unknown (HELO tsunamihost.ch) (213.144.137.210) by pb1.pair.com with SMTP; 18 Feb 2003 14:14:59 - Received: (qmail 30295 invoked from network); 18 Feb 2003 14:14:55 - Received: from unknown (HELO san) ([EMAIL PROTECTED]@212.254.137.70) by tsunamihost.ch with SMTP; 18 Feb 2003 14:14:55 - Date: Tue, 18 Feb 2003 15:18:11 + From: Daniel Lorch [EMAIL PROTECTED] To: [EMAIL PROTECTED] Message-Id: [EMAIL PROTECTED] X-Mailer: ? Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] Re: confirm unsubscribe from php-cvs@lists.php.net
hi, Buggy mailclient, sorry. -daniel -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard file.c
moriyoshi Tue Feb 18 10:22:46 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/standard file.c
Log:
MFH(r1.307): Fixed bug #21689
Index: php4/ext/standard/file.c
diff -u php4/ext/standard/file.c:1.279.2.8 php4/ext/standard/file.c:1.279.2.9
--- php4/ext/standard/file.c:1.279.2.8 Fri Jan 24 05:00:18 2003
+++ php4/ext/standard/file.cTue Feb 18 10:22:46 2003
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.279.2.8 2003/01/24 10:00:18 sniper Exp $ */
+/* $Id: file.c,v 1.279.2.9 2003/02/18 15:22:46 moriyoshi Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -2181,7 +2181,7 @@
lineEnd = emalloc(len + 1);
bptr = buf;
tptr = buf + strlen(buf) -1;
- while ( isspace((int) *tptr) (*tptr!=delimiter) (tptr bptr) ) tptr--;
+ while ( isspace((int)*(unsigned char *)tptr) (*tptr!=delimiter) (tptr
+bptr) ) tptr--;
tptr++;
strcpy(lineEnd, tptr);
@@ -2203,7 +2203,7 @@
do {
/* 1. Strip any leading space */
- while(isspace((int) *bptr) (*bptr!=delimiter)) bptr++;
+ while(isspace((int)*(unsigned char *)bptr) (*bptr!=delimiter))
+bptr++;
/* 2. Read field, leaving bptr pointing at start of next field */
if (enclosure *bptr == enclosure) {
bptr++; /* move on to first character in field */
@@ -2252,7 +2252,7 @@
temp = erealloc(temp, temp_len+1);
bptr = buf;
tptr = buf + strlen(buf) -1;
- while (isspace((int) *tptr)
(*tptr!=delimiter) (tptr bptr))
+ while (isspace((int)*(unsigned char
+*)tptr) (*tptr!=delimiter) (tptr bptr))
tptr--;
tptr++;
strcpy(lineEnd, tptr);
@@ -2273,7 +2273,7 @@
if (strlen(temp)) {
tptr--;
- while (isspace((int)*tptr) (*tptr!=delimiter))
+ while (isspace((int)*(unsigned char *)tptr)
+(*tptr!=delimiter))
*tptr-- = 0;/* strip any trailing spaces */
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) / NEWS
moriyoshi Tue Feb 18 10:26:21 2003 EDT Modified files: (Branch: PHP_4_3) /php4 NEWS Log: BFN Index: php4/NEWS diff -u php4/NEWS:1.1247.2.93 php4/NEWS:1.1247.2.94 --- php4/NEWS:1.1247.2.93 Mon Feb 17 13:16:49 2003 +++ php4/NEWS Tue Feb 18 10:26:20 2003 @@ -49,6 +49,8 @@ (Wez) - Fixed bug #21809 (select would not always timeout during socket shutdown). (Wez) - Fixed bug #21725 (return behaviour differs between include and require). (Zeev) +- Fixed bug #21689 (fgetcsv() suppresses some characters before a separator). + (Masahiro, Moriyoshi) - Fixed bug #21597 (made glob() understand Windows paths). (Edin) - Fixed bug #21549 (problem with Ingres II persistent connections). (Jani) - Fixed bug #21544 (Extended checks for where FreeTDS is installed). (Frank) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard string.c
moriyoshi Tue Feb 18 13:11:35 2003 EDT
Modified files:
/php4/ext/standard string.c
Log:
Fixed bug #21708 (ucfirst() trouble again)
# this bug is related to bug #21689
Index: php4/ext/standard/string.c
diff -u php4/ext/standard/string.c:1.358 php4/ext/standard/string.c:1.359
--- php4/ext/standard/string.c:1.358Fri Feb 14 13:59:50 2003
+++ php4/ext/standard/string.c Tue Feb 18 13:11:34 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.358 2003/02/14 18:59:50 moriyoshi Exp $ */
+/* $Id: string.c,v 1.359 2003/02/18 18:11:34 moriyoshi Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -2019,7 +2019,7 @@
*r = toupper((unsigned char) *r);
for (r_end = r + Z_STRLEN_P(return_value) - 1; r r_end; ) {
- if (isspace((int) *r++)) {
+ if (isspace((int) *(unsigned char *)r++)) {
*r = toupper((unsigned char) *r);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) / NEWS
moriyoshi Tue Feb 18 13:15:44 2003 EDT Modified files: (Branch: PHP_4_3) /php4 NEWS Log: BFN Index: php4/NEWS diff -u php4/NEWS:1.1247.2.94 php4/NEWS:1.1247.2.95 --- php4/NEWS:1.1247.2.94 Tue Feb 18 10:26:20 2003 +++ php4/NEWS Tue Feb 18 13:15:44 2003 @@ -49,6 +49,7 @@ (Wez) - Fixed bug #21809 (select would not always timeout during socket shutdown). (Wez) - Fixed bug #21725 (return behaviour differs between include and require). (Zeev) +- Fixed bug #21708 (ucfirst() trouble again). (Moriyoshi) - Fixed bug #21689 (fgetcsv() suppresses some characters before a separator). (Masahiro, Moriyoshi) - Fixed bug #21597 (made glob() understand Windows paths). (Edin) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4) /ext/session php_session.h session.c
sas Tue Feb 18 13:51:34 2003 EDT
Modified files: (Branch: PHP_4)
/php4/ext/session php_session.h session.c
Log:
MFH session_regenerate_id
Index: php4/ext/session/php_session.h
diff -u php4/ext/session/php_session.h:1.84.2.1.2.2
php4/ext/session/php_session.h:1.84.2.1.2.3
--- php4/ext/session/php_session.h:1.84.2.1.2.2 Mon Feb 10 19:53:32 2003
+++ php4/ext/session/php_session.h Tue Feb 18 13:51:34 2003
@@ -132,6 +132,7 @@
PHP_FUNCTION(session_module_name);
PHP_FUNCTION(session_save_path);
PHP_FUNCTION(session_id);
+PHP_FUNCTION(session_regenerate_id);
PHP_FUNCTION(session_decode);
PHP_FUNCTION(session_register);
PHP_FUNCTION(session_unregister);
Index: php4/ext/session/session.c
diff -u php4/ext/session/session.c:1.336.2.5.2.2
php4/ext/session/session.c:1.336.2.5.2.3
--- php4/ext/session/session.c:1.336.2.5.2.2Mon Feb 10 19:53:32 2003
+++ php4/ext/session/session.c Tue Feb 18 13:51:34 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.336.2.5.2.2 2003/02/11 00:53:32 sas Exp $ */
+/* $Id: session.c,v 1.336.2.5.2.3 2003/02/18 18:51:34 sas Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -61,6 +61,7 @@
PHP_FE(session_module_name, NULL)
PHP_FE(session_save_path, NULL)
PHP_FE(session_id,NULL)
+ PHP_FE(session_regenerate_id, NULL)
PHP_FE(session_decode,NULL)
PHP_FE(session_register, NULL)
PHP_FE(session_unregister,NULL)
@@ -1355,6 +1356,20 @@
}
RETVAL_STRING(old, 0);
+}
+/* }}} */
+
+/* {{{ proto string session_regenerate_id()
+ Update the current session id with a newly generated one. */
+PHP_FUNCTION(session_regenerate_id)
+{
+ if (PS(mod)) {
+ if (PS(id)) efree(PS(id));
+
+ PS(id) = PS(mod)-s_create_sid(PS(mod_data), NULL TSRMLS_CC);
+ RETURN_TRUE;
+ }
+ RETURN_FALSE;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/rpc/com com.c /main/streams streams.c
wez Tue Feb 18 14:03:45 2003 EDT
Modified files:
/php4/ext/rpc/com com.c
/php4/main/streams streams.c
Log:
Fix incorrect TSRMLS_CC usage.
Fix com_create_guid()
Index: php4/ext/rpc/com/com.c
diff -u php4/ext/rpc/com/com.c:1.24 php4/ext/rpc/com/com.c:1.25
--- php4/ext/rpc/com/com.c:1.24 Tue Feb 18 04:46:18 2003
+++ php4/ext/rpc/com/com.c Tue Feb 18 14:03:43 2003
@@ -841,7 +841,7 @@
ZEND_WRONG_PARAM_COUNT();
}
- if (CoCreateGuid(retval) StringFromCLSID(retval, guid_string)) {
+ if (CoCreateGuid(retval) == S_OK StringFromCLSID(retval, guid_string) ==
+S_OK) {
Z_TYPE_P(return_value) = IS_STRING;
Z_STRVAL_P(return_value) = php_OLECHAR_to_char(guid_string,
Z_STRLEN_P(return_value), CP_ACP, 0);
Index: php4/main/streams/streams.c
diff -u php4/main/streams/streams.c:1.3 php4/main/streams/streams.c:1.4
--- php4/main/streams/streams.c:1.3 Mon Feb 17 20:39:26 2003
+++ php4/main/streams/streams.c Tue Feb 18 14:03:44 2003
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: streams.c,v 1.3 2003/02/18 01:39:26 wez Exp $ */
+/* $Id: streams.c,v 1.4 2003/02/18 19:03:44 wez Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -1198,6 +1198,7 @@
size_t readchunk;
size_t haveread = 0;
size_t didread;
+ php_stream_statbuf ssbuf;
#if HAVE_MMAP
int srcfd;
#endif
@@ -1243,14 +1244,11 @@
}
#endif
- {
- php_stream_statbuf sbuf;
- if (php_stream_stat(src, sbuf TSRMLS_CC) == 0) {
- /* in the event that the source file is 0 bytes, return 1 to
indicate success
-* because opening the file to write had already created a
copy */
- if (sbuf.sb.st_size == 0) {
- return 1;
- }
+ if (php_stream_stat(src, ssbuf) == 0) {
+ /* in the event that the source file is 0 bytes, return 1 to indicate
+success
+* because opening the file to write had already created a copy */
+ if (ssbuf.sb.st_size == 0) {
+ return 1;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4) /ext/session php_session.h session.c
sas Tue Feb 18 14:14:15 2003 EDT
Modified files: (Branch: PHP_4)
/php4/ext/session php_session.h session.c
Log:
MFH regen improvements
Index: php4/ext/session/php_session.h
diff -u php4/ext/session/php_session.h:1.84.2.1.2.3
php4/ext/session/php_session.h:1.84.2.1.2.4
--- php4/ext/session/php_session.h:1.84.2.1.2.3 Tue Feb 18 13:51:34 2003
+++ php4/ext/session/php_session.h Tue Feb 18 14:14:14 2003
@@ -121,6 +121,7 @@
long hash_func;
long hash_bits_per_character;
+ int send_cookie;
} php_ps_globals;
typedef php_ps_globals zend_ps_globals;
Index: php4/ext/session/session.c
diff -u php4/ext/session/session.c:1.336.2.5.2.3
php4/ext/session/session.c:1.336.2.5.2.4
--- php4/ext/session/session.c:1.336.2.5.2.3Tue Feb 18 13:51:34 2003
+++ php4/ext/session/session.c Tue Feb 18 14:14:14 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.336.2.5.2.3 2003/02/18 18:51:34 sas Exp $ */
+/* $Id: session.c,v 1.336.2.5.2.4 2003/02/18 19:14:14 sas Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1023,7 +1023,6 @@
zval **ppid;
zval **data;
char *p;
- int send_cookie = 1;
int define_sid = 1;
int module_number = PS(module_number);
int nrand;
@@ -1031,6 +1030,7 @@
PS(apply_trans_sid) = PS(use_trans_sid);
+ PS(send_cookie) = 1;
if (PS(session_status) != php_session_none)
return;
@@ -1050,7 +1050,7 @@
lensess + 1, (void **) ppid) == SUCCESS) {
PPID2SID;
PS(apply_trans_sid) = 0;
- send_cookie = 0;
+ PS(send_cookie) = 0;
define_sid = 0;
}
@@ -1061,7 +1061,7 @@
zend_hash_find(Z_ARRVAL_PP(data), PS(session_name),
lensess + 1, (void **) ppid) == SUCCESS) {
PPID2SID;
- send_cookie = 0;
+ PS(send_cookie) = 0;
}
if (!PS(use_only_cookies) !PS(id)
@@ -1071,7 +1071,7 @@
zend_hash_find(Z_ARRVAL_PP(data), PS(session_name),
lensess + 1, (void **) ppid) == SUCCESS) {
PPID2SID;
- send_cookie = 0;
+ PS(send_cookie) = 0;
}
}
@@ -1104,20 +1104,20 @@
strstr(Z_STRVAL_PP(data), PS(extern_referer_chk)) == NULL) {
efree(PS(id));
PS(id) = NULL;
- send_cookie = 1;
+ PS(send_cookie) = 1;
if (PS(use_trans_sid))
PS(apply_trans_sid) = 1;
}
php_session_initialize(TSRMLS_C);
- if (!PS(use_cookies) send_cookie) {
+ if (!PS(use_cookies) PS(send_cookie)) {
if (PS(use_trans_sid))
PS(apply_trans_sid) = 1;
- send_cookie = 0;
+ PS(send_cookie) = 0;
}
- if (send_cookie) {
+ if (PS(send_cookie)) {
php_session_send_cookie(TSRMLS_C);
}
@@ -1363,10 +1363,15 @@
Update the current session id with a newly generated one. */
PHP_FUNCTION(session_regenerate_id)
{
- if (PS(mod)) {
+ if (PS(session_status) == php_session_active) {
if (PS(id)) efree(PS(id));
PS(id) = PS(mod)-s_create_sid(PS(mod_data), NULL TSRMLS_CC);
+
+ if (PS(send_cookie)) {
+ php_session_send_cookie(TSRMLS_C);
+ }
+
RETURN_TRUE;
}
RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/session php_session.h session.c
sas Tue Feb 18 14:29:38 2003 EDT
Modified files:
/php4/ext/session php_session.h session.c
Log:
Refactor new-session-id code
Index: php4/ext/session/php_session.h
diff -u php4/ext/session/php_session.h:1.90 php4/ext/session/php_session.h:1.91
--- php4/ext/session/php_session.h:1.90 Tue Feb 18 14:13:49 2003
+++ php4/ext/session/php_session.h Tue Feb 18 14:29:38 2003
@@ -122,6 +122,7 @@
long hash_func;
long hash_bits_per_character;
int send_cookie;
+ int define_sid;
} php_ps_globals;
typedef php_ps_globals zend_ps_globals;
Index: php4/ext/session/session.c
diff -u php4/ext/session/session.c:1.353 php4/ext/session/session.c:1.354
--- php4/ext/session/session.c:1.353Tue Feb 18 14:13:49 2003
+++ php4/ext/session/session.c Tue Feb 18 14:29:38 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.353 2003/02/18 19:13:49 sas Exp $ */
+/* $Id: session.c,v 1.354 2003/02/18 19:29:38 sas Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1018,18 +1018,46 @@
convert_to_string((*ppid)); \
PS(id) = estrndup(Z_STRVAL_PP(ppid), Z_STRLEN_PP(ppid))
+static void php_session_reset_id(TSRMLS_D)
+{
+ int module_number = PS(module_number);
+
+ if (PS(send_cookie)) {
+ php_session_send_cookie(TSRMLS_C);
+ }
+
+ /* if the SID constant exists, destroy it. */
+ zend_hash_del(EG(zend_constants), sid, sizeof(sid));
+
+ if (PS(define_sid)) {
+ smart_str var = {0};
+
+ smart_str_appends(var, PS(session_name));
+ smart_str_appendc(var, '=');
+ smart_str_appends(var, PS(id));
+ smart_str_0(var);
+ REGISTER_STRINGL_CONSTANT(SID, var.c, var.len, 0);
+ } else {
+ REGISTER_STRINGL_CONSTANT(SID, empty_string, 0, 0);
+ }
+
+ if (PS(apply_trans_sid)) {
+ php_url_scanner_reset_vars(TSRMLS_C);
+ php_url_scanner_add_var(PS(session_name), strlen(PS(session_name)),
+PS(id), strlen(PS(id)), 0 TSRMLS_CC);
+ }
+}
+
PHPAPI void php_session_start(TSRMLS_D)
{
zval **ppid;
zval **data;
char *p;
- int define_sid = 1;
- int module_number = PS(module_number);
int nrand;
int lensess;
PS(apply_trans_sid) = PS(use_trans_sid);
+ PS(define_sid) = 1;
PS(send_cookie) = 1;
if (PS(session_status) != php_session_none)
return;
@@ -1051,7 +1079,7 @@
PPID2SID;
PS(apply_trans_sid) = 0;
PS(send_cookie) = 0;
- define_sid = 0;
+ PS(define_sid) = 0;
}
if (!PS(use_only_cookies) !PS(id)
@@ -1116,30 +1144,10 @@
PS(apply_trans_sid) = 1;
PS(send_cookie) = 0;
}
-
- if (PS(send_cookie)) {
- php_session_send_cookie(TSRMLS_C);
- }
- /* if the SID constant exists, destroy it. */
- zend_hash_del(EG(zend_constants), sid, sizeof(sid));
+ php_session_reset_id(TSRMLS_C);
- if (define_sid) {
- smart_str var = {0};
-
- smart_str_appendl(var, PS(session_name), lensess);
- smart_str_appendc(var, '=');
- smart_str_appends(var, PS(id));
- smart_str_0(var);
- REGISTER_STRINGL_CONSTANT(SID, var.c, var.len, 0);
- } else {
- REGISTER_STRINGL_CONSTANT(SID, empty_string, 0, 0);
- }
-
PS(session_status) = php_session_active;
- if (PS(apply_trans_sid)) {
- php_url_scanner_add_var(PS(session_name), strlen(PS(session_name)),
PS(id), strlen(PS(id)), 0 TSRMLS_CC);
- }
php_session_cache_limiter(TSRMLS_C);
@@ -1368,10 +1376,8 @@
PS(id) = PS(mod)-s_create_sid(PS(mod_data), NULL TSRMLS_CC);
- if (PS(send_cookie)) {
- php_session_send_cookie(TSRMLS_C);
- }
-
+ php_session_reset_id(TSRMLS_C);
+
RETURN_TRUE;
}
RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4) /ext/session php_session.h session.c
sas Tue Feb 18 14:32:45 2003 EDT
Modified files: (Branch: PHP_4)
/php4/ext/session php_session.h session.c
Log:
MFH refactoring
Index: php4/ext/session/php_session.h
diff -u php4/ext/session/php_session.h:1.84.2.1.2.4
php4/ext/session/php_session.h:1.84.2.1.2.5
--- php4/ext/session/php_session.h:1.84.2.1.2.4 Tue Feb 18 14:14:14 2003
+++ php4/ext/session/php_session.h Tue Feb 18 14:32:45 2003
@@ -122,6 +122,7 @@
long hash_func;
long hash_bits_per_character;
int send_cookie;
+ int define_sid;
} php_ps_globals;
typedef php_ps_globals zend_ps_globals;
Index: php4/ext/session/session.c
diff -u php4/ext/session/session.c:1.336.2.5.2.4
php4/ext/session/session.c:1.336.2.5.2.5
--- php4/ext/session/session.c:1.336.2.5.2.4Tue Feb 18 14:14:14 2003
+++ php4/ext/session/session.c Tue Feb 18 14:32:45 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.336.2.5.2.4 2003/02/18 19:14:14 sas Exp $ */
+/* $Id: session.c,v 1.336.2.5.2.5 2003/02/18 19:32:45 sas Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1018,18 +1018,46 @@
convert_to_string((*ppid)); \
PS(id) = estrndup(Z_STRVAL_PP(ppid), Z_STRLEN_PP(ppid))
+static void php_session_reset_id(TSRMLS_D)
+{
+ int module_number = PS(module_number);
+
+ if (PS(send_cookie)) {
+ php_session_send_cookie(TSRMLS_C);
+ }
+
+ /* if the SID constant exists, destroy it. */
+ zend_hash_del(EG(zend_constants), sid, sizeof(sid));
+
+ if (PS(define_sid)) {
+ smart_str var = {0};
+
+ smart_str_appends(var, PS(session_name));
+ smart_str_appendc(var, '=');
+ smart_str_appends(var, PS(id));
+ smart_str_0(var);
+ REGISTER_STRINGL_CONSTANT(SID, var.c, var.len, 0);
+ } else {
+ REGISTER_STRINGL_CONSTANT(SID, empty_string, 0, 0);
+ }
+
+ if (PS(apply_trans_sid)) {
+ php_url_scanner_reset_vars(TSRMLS_C);
+ php_url_scanner_add_var(PS(session_name), strlen(PS(session_name)),
+PS(id), strlen(PS(id)), 0 TSRMLS_CC);
+ }
+}
+
PHPAPI void php_session_start(TSRMLS_D)
{
zval **ppid;
zval **data;
char *p;
- int define_sid = 1;
- int module_number = PS(module_number);
int nrand;
int lensess;
PS(apply_trans_sid) = PS(use_trans_sid);
+ PS(define_sid) = 1;
PS(send_cookie) = 1;
if (PS(session_status) != php_session_none)
return;
@@ -1051,7 +1079,7 @@
PPID2SID;
PS(apply_trans_sid) = 0;
PS(send_cookie) = 0;
- define_sid = 0;
+ PS(define_sid) = 0;
}
if (!PS(use_only_cookies) !PS(id)
@@ -1116,30 +1144,10 @@
PS(apply_trans_sid) = 1;
PS(send_cookie) = 0;
}
-
- if (PS(send_cookie)) {
- php_session_send_cookie(TSRMLS_C);
- }
- /* if the SID constant exists, destroy it. */
- zend_hash_del(EG(zend_constants), sid, sizeof(sid));
+ php_session_reset_id(TSRMLS_C);
- if (define_sid) {
- smart_str var = {0};
-
- smart_str_appendl(var, PS(session_name), lensess);
- smart_str_appendc(var, '=');
- smart_str_appends(var, PS(id));
- smart_str_0(var);
- REGISTER_STRINGL_CONSTANT(SID, var.c, var.len, 0);
- } else {
- REGISTER_STRINGL_CONSTANT(SID, empty_string, 0, 0);
- }
-
PS(session_status) = php_session_active;
- if (PS(apply_trans_sid)) {
- php_url_scanner_add_var(PS(session_name), strlen(PS(session_name)),
PS(id), strlen(PS(id)), 0 TSRMLS_CC);
- }
php_session_cache_limiter(TSRMLS_C);
@@ -1368,10 +1376,8 @@
PS(id) = PS(mod)-s_create_sid(PS(mod_data), NULL TSRMLS_CC);
- if (PS(send_cookie)) {
- php_session_send_cookie(TSRMLS_C);
- }
-
+ php_session_reset_id(TSRMLS_C);
+
RETURN_TRUE;
}
RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / run-tests.php
derick Tue Feb 18 15:07:59 2003 EDT
Modified files:
/php4 run-tests.php
Log:
- Add check for proc_open() being available
Index: php4/run-tests.php
diff -u php4/run-tests.php:1.144 php4/run-tests.php:1.145
--- php4/run-tests.php:1.144Sat Feb 15 22:48:48 2003
+++ php4/run-tests.php Tue Feb 18 15:07:59 2003
@@ -57,6 +57,19 @@
exit;
}
+if (!function_exists(proc_open)) {
+ echo NO_PROC_OPEN_ERROR
+
++---+
+| ! ERROR ! |
+| The test-suite requires that proc_open() is available.|
+| Please check if you disabled it in php.ini. |
++---+
+
+NO_PROC_OPEN_ERROR;
+exit;
+}
+
// change into the PHP source directory.
if (getenv('TEST_PHP_SRCDIR')) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/dba/libflatfile flatfile.h
helly Tue Feb 18 15:48:06 2003 EDT
Modified files:
/php4/ext/dba/libflatfile flatfile.h
Log:
avoiding problems
Index: php4/ext/dba/libflatfile/flatfile.h
diff -u php4/ext/dba/libflatfile/flatfile.h:1.7 php4/ext/dba/libflatfile/flatfile.h:1.8
--- php4/ext/dba/libflatfile/flatfile.h:1.7 Tue Dec 31 11:06:26 2002
+++ php4/ext/dba/libflatfile/flatfile.h Tue Feb 18 15:48:05 2003
@@ -16,10 +16,10 @@
+--+
*/
-/* $Id: flatfile.h,v 1.7 2002/12/31 16:06:26 sebastian Exp $ */
+/* $Id: flatfile.h,v 1.8 2003/02/18 20:48:05 helly Exp $ */
-#ifndef PHP_LIBDBM_H
-#define PHP_LIBDBM_H
+#ifndef PHP_LIB_FLATFILE_H
+#define PHP_LIB_FLATFILE_H
typedef struct {
char *dptr;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
rasmus Tue Feb 18 16:31:02 2003 EDT Modified files: /CVSROOTavail Log: Karma for new accounts Index: CVSROOT/avail diff -u CVSROOT/avail:1.595 CVSROOT/avail:1.596 --- CVSROOT/avail:1.595 Tue Feb 18 04:14:31 2003 +++ CVSROOT/avail Tue Feb 18 16:31:02 2003 @@ -26,7 +26,7 @@ # The PHP Documentation Group maintains the documentation and its # translations. -avail|frogger,coldocean,alan_k,fleaslob,chad,torben,lynch,kk,ted,kwazy,aka,affinity,paul,skaag,pglat,mbritton,coar,lwest,joey,bibi,mrobinso,lwh,perugini,hamoralesr,tzwenny,hirokawa,drews,paulsen,hartmann,philross,leon,valdirh,dmarion,dubois,jonen,tschuer,tfromm,manuel,stas,danbeck,sli,jmcastagnetto,mohrt,cris,goba,samesch,jon,soneca,kaufm,ronabop,glace,latoserver,phpguru_dk,lojmann,rafael,jan,jcmeloni,chrullrich,mk,sebastian,troels,mathieu,voize,phaethon,mgx,mj,corean,pandach,brown,cycle98,vizvil,openlife,regina,cynic,jpm,dams,alponce,menuconfig,obst,topgoods,karoora,pcraft,suvia,zak,zimt,mgx,sintoris,jmoore,ftfuture,uttam,ag315,ropik,jbi1979,bbonev,malo,afortaleza,neotron,cg,delrom,jkj,hellekin,kgergely,andreroq,eduardh,cnewbill,fuzzy74,inki,bjoern,fams,smasiello,dim,lucasr,cpereira,lagflores,kjh90,ernani,theseer,cevm,noribsd,eskaly,mctrash,berto,leobopp,tcr,subjective,ufux,virtual,fireclaw,hadar_p,asautins,dbenson,aleczapka,flaviobrito,mattias,tom,amiller,cortesi,lancelot_,irc-html,mkaufman,rarruda,j-f,betz,philip,alindeman,thyla,cucinato,jpsantos,zyprexia,tpug,ozgurakan,mitja,conni,sts,stefanhinz,georg,nmav,subbie,leszek,spheroid,joona,kjartno,slawek,nooboo,alan_dangelo,ae,ahambazaza,nohn,kaser01,visualmind,abohamam,stefan,kurtz,luk,tronic,moh,bernd,wilko,yohgaki,fujimoto,gerzson,webler,spooky,tinenie,cece,daniel,offs,boo,nhoizey,nogada,albaity,joerg,mazen,neil536t,maco,imajes,hakan,chief977,dwestfal,ott,shlomi,holev,raful,yuval,tomer,masterjy,barak,ido,mork,lior,gal,adiju,cr_depend,cyberowl,daniel.paul,florian,iulianphp,kappu,michelinux,muricaru,narcotic,dt,valy,critix,spg1et,ck,costra,fancao0515,rbenea,tibee,ins0mnia,eriksson,wenz,jaxler,volker,avaly,bernardojts,bs,anderson,tal,sander,matroz,thales,dorun,ave,adu,adamf1,figuric,katow,l30n4rd0,samih,mmeier,wentzel,scaro,amtd,aspinei,costello,coti,lmaxcar,lucaiacono,manuzhai,mcastro,sukamade,darvina,peter,maxim,adir,roland,romakhin,jmurin,n0nick,attila,sagi,kai,microbrain,rhheo,shimi,k.schroeder,djworld,emil,lboshell,netholic,dmitry83,machado,progcom,verdana,yincheng,surfmax,arzt,nicos,chregu,msopacua,bbd,cyril,gregory,hudzilla,klean,mignoni,wiesemann,xqi,mersal,zruya,sean,staybyte,daif,aber_sabeel,alzahrani,ayman_h,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,spic,truelight,gnuhacker,_batman_,sachat,dallas,dart,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,feyge,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,phpclub,xelis,adrianr,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|phpdoc,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-de,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh
[PHP-CVS] cvs: php4 /ext/dba/libflatfile flatfile.c
helly Tue Feb 18 17:19:18 2003 EDT
Modified files:
/php4/ext/dba/libflatfile flatfile.c
Log:
- wrong use of sizeof(char)
- use define for block size
- a bit faster
Index: php4/ext/dba/libflatfile/flatfile.c
diff -u php4/ext/dba/libflatfile/flatfile.c:1.9
php4/ext/dba/libflatfile/flatfile.c:1.10
--- php4/ext/dba/libflatfile/flatfile.c:1.9 Tue Feb 18 15:49:52 2003
+++ php4/ext/dba/libflatfile/flatfile.c Tue Feb 18 17:19:18 2003
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: flatfile.c,v 1.9 2003/02/18 20:49:52 helly Exp $ */
+/* $Id: flatfile.c,v 1.10 2003/02/18 22:19:18 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -38,6 +38,8 @@
#include flatfile.h
+#define FLATFILE_BLOCK_SIZE 1024
+
/*
* ret = -1 means that database was opened for read-only
* ret = 0 success
@@ -84,25 +86,16 @@
*/
datum flatfile_fetch(flatfile *dba, datum key_datum TSRMLS_DC) {
datum value_datum = {NULL, 0};
- size_t num=0;
- size_t buf_size = 1024;
- char *buf;
+ char buf[16];
if (flatfile_findkey(dba, key_datum TSRMLS_CC)) {
- buf = emalloc((buf_size+1) * sizeof(char));
- if (php_stream_gets(dba-fp, buf, 15)) {
- num = atoi(buf);
- if (num buf_size) {
- buf_size+=num;
- buf = erealloc(buf, (buf_size+1)*sizeof(char));
- }
- php_stream_read(dba-fp, buf, num);
- value_datum.dptr = buf;
- value_datum.dsize = num;
+ if (php_stream_gets(dba-fp, buf, sizeof(buf))) {
+ value_datum.dsize = atoi(buf);
+ value_datum.dptr = emalloc(value_datum.dsize+1);
+ value_datum.dsize = php_stream_read(dba-fp, value_datum.dptr,
+value_datum.dsize);
} else {
value_datum.dptr = NULL;
value_datum.dsize = 0;
- efree(buf);
}
}
return value_datum;
@@ -114,62 +107,55 @@
int flatfile_delete(flatfile *dba, datum key_datum TSRMLS_DC) {
char *key = key_datum.dptr;
size_t size = key_datum.dsize;
-
- char *buf;
+ size_t buf_size = FLATFILE_BLOCK_SIZE;
+ char *buf = emalloc(buf_size);
size_t num;
- size_t buf_size = 1024;
size_t pos;
php_stream_rewind(dba-fp);
-
- buf = emalloc((buf_size + 1)*sizeof(char));
while(!php_stream_eof(dba-fp)) {
/* read in the length of the key name */
if (!php_stream_gets(dba-fp, buf, 15)) {
break;
}
num = atoi(buf);
- if (num buf_size) {
- buf_size += num;
- buf = erealloc(buf, (buf_size+1)*sizeof(char));
+ if (num = buf_size) {
+ buf_size = num + FLATFILE_BLOCK_SIZE;
+ buf = erealloc(buf, buf_size);
}
pos = php_stream_tell(dba-fp);
/* read in the key name */
- num = php_stream_read(dba-fp, buf, sizeof(char)*num);
+ num = php_stream_read(dba-fp, buf, num);
if (num 0) {
break;
}
- *(buf+num) = '\0';
if (size == num !memcmp(buf, key, size)) {
php_stream_seek(dba-fp, pos, SEEK_SET);
php_stream_putc(dba-fp, 0);
php_stream_flush(dba-fp);
php_stream_seek(dba-fp, 0L, SEEK_END);
- if (buf) {
- efree(buf);
- }
+ efree(buf);
return SUCCESS;
}
/* read in the length of the value */
- if (!php_stream_gets(dba-fp, buf, 15))
+ if (!php_stream_gets(dba-fp, buf, 15)) {
break;
+ }
num = atoi(buf);
- if (num buf_size) {
- buf_size+=num;
- buf = erealloc(buf, (buf_size+1)*sizeof(char));
+ if (num = buf_size) {
+ buf_size = num + FLATFILE_BLOCK_SIZE;
+ buf = erealloc(buf, buf_size);
}
/* read in the value */
- num = php_stream_read(dba-fp, buf, sizeof(char)*num);
+ num = php_stream_read(dba-fp, buf, num);
if (num 0) {
break;
}
}
- if (buf) {
- efree(buf);
- }
+ efree(buf);
return FAILURE;
}
/* }}} */
[PHP-CVS] cvs: php4 /ext/rpc/skeleton skeleton.c
jon Tue Feb 18 18:22:16 2003 EDT
Modified files:
/php4/ext/rpc/skeleton skeleton.c
Log:
Remove a stray COM reference.
Index: php4/ext/rpc/skeleton/skeleton.c
diff -u php4/ext/rpc/skeleton/skeleton.c:1.5 php4/ext/rpc/skeleton/skeleton.c:1.6
--- php4/ext/rpc/skeleton/skeleton.c:1.5Mon Feb 10 15:58:29 2003
+++ php4/ext/rpc/skeleton/skeleton.cTue Feb 18 18:22:14 2003
@@ -115,7 +115,7 @@
DISPLAY_INI_ENTRIES();
}
-#ifdef COMPILE_DL_COM
+#ifdef COMPILE_DL_SKELETON
ZEND_GET_MODULE(skeleton);
#endif
@@ -220,4 +220,4 @@
/* custom functions */
ZEND_FUNCTION(skeleton_function)
{
-}
\ No newline at end of file
+}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard filters.c
moriyoshi Tue Feb 18 18:22:49 2003 EDT
Modified files:
/php4/ext/standard filters.c
Log:
Revived convert filter codes
Index: php4/ext/standard/filters.c
diff -u php4/ext/standard/filters.c:1.24 php4/ext/standard/filters.c:1.25
--- php4/ext/standard/filters.c:1.24Mon Feb 17 20:22:21 2003
+++ php4/ext/standard/filters.c Tue Feb 18 18:22:49 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: filters.c,v 1.24 2003/02/18 01:22:21 wez Exp $ */
+/* $Id: filters.c,v 1.25 2003/02/18 23:22:49 moriyoshi Exp $ */
#include php.h
#include php_globals.h
@@ -1016,14 +1016,9 @@
/* }}} */
typedef struct _php_convert_filter {
- php_conv *write_cd;
- php_conv *read_cd;
+ php_conv *cd;
int persistent;
char *filtername;
-
- /* ring buffer for read operation */
- char read_buf[4096];
- size_t read_buf_left;
} php_convert_filter;
#define PHP_CONV_BASE64_ENCODE 1
@@ -1303,40 +1298,22 @@
#undef GET_BOOL_PROP
static int php_convert_filter_ctor(php_convert_filter *inst,
- int write_conv_mode, HashTable *write_conv_opts,
- int read_conv_mode, HashTable *read_conv_opts,
+ int conv_mode, HashTable *conv_opts,
const char *filtername, int persistent)
{
- php_conv *write_cd = NULL;
- php_conv *read_cd = NULL;
-
inst-persistent = persistent;
-
inst-filtername = pestrdup(filtername, persistent);
- if ((write_cd = php_conv_open(write_conv_mode, write_conv_opts, persistent))
== NULL) {
- goto out_failure;
- }
-
- if ((read_cd = php_conv_open(read_conv_mode, read_conv_opts, persistent)) ==
NULL) {
+ if ((inst-cd = php_conv_open(conv_mode, conv_opts, persistent)) == NULL) {
goto out_failure;
}
- inst-write_cd = write_cd;
- inst-read_cd = read_cd;
-
- inst-read_buf_left = 0;
-
return SUCCESS;
out_failure:
- if (write_cd != NULL) {
- php_conv_dtor(write_cd);
- pefree(write_cd, persistent);
- }
- if (read_cd != NULL) {
- php_conv_dtor(read_cd);
- pefree(read_cd, persistent);
+ if (inst-cd != NULL) {
+ php_conv_dtor(inst-cd);
+ pefree(inst-cd, persistent);
}
if (inst-filtername != NULL) {
pefree(inst-filtername, persistent);
@@ -1346,14 +1323,9 @@
static void php_convert_filter_dtor(php_convert_filter *inst)
{
- if (inst-write_cd != NULL) {
- php_conv_dtor(inst-write_cd);
- pefree(inst-write_cd, inst-persistent);
- }
-
- if (inst-read_cd != NULL) {
- php_conv_dtor(inst-read_cd);
- pefree(inst-read_cd, inst-persistent);
+ if (inst-cd != NULL) {
+ php_conv_dtor(inst-cd);
+ pefree(inst-cd, inst-persistent);
}
if (inst-filtername != NULL) {
@@ -1370,183 +1342,162 @@
int flags
TSRMLS_DC)
{
- php_stream_bucket *bucket;
+ php_stream_bucket *bucket, *new_bucket;
size_t consumed = 0;
php_conv_err_t err;
php_convert_filter *inst = (php_convert_filter *)thisfilter-abstract;
+ char *out_buf;
+ size_t out_buf_size;
+ char *pd;
+ size_t ocnt;
+
+ if (buckets_in-head == NULL buckets_in-tail == NULL) {
+ /* flush operation */
+
+ out_buf_size = 64;
+ out_buf = pemalloc(out_buf_size, inst-persistent);
+ ocnt = out_buf_size;
+ pd = out_buf;
- while (thisfilter-buffer.head || buckets_in-head) {
- /* take head off buffer first, then input brigade */
- bucket = thisfilter-buffer.head ? thisfilter-buffer.head :
buckets_in-head;
- php_stream_bucket_unlink(bucket TSRMLS_CC);
-
-#if 0
- err = php_conv_convert(inst-write_cd, ... )
-
- /* update consumed by the number of bytes just used */
-
- /* give output bucket to next in chain */
- php_stream_bucket_append(buckets_out, bucket TSRMLS_CC);
-
- if (only used part of buffer) {
- bucket *left, *right;
- php_stream_buffer_split(bucket, left, right, used_len
TSRMLS_CC);
- php_stream_buffer_delref(left); /* delete the part we consumed
*/
- php_stream_buffer_append(filter-buffer, right TSRMLS_CC);
- break;
- }
-#endif
- }
-
- if (bytes_consumed) {
- *bytes_consumed = consumed;
- }
-
- return PSFS_PASS_ON;
-}
-
-
-
-
-#if 0
-static size_t strfilter_convert_write(php_stream *stream, php_stream_filter
*thisfilter,
- const char *buf,
Re: [PHP-CVS] cvs: php4 / run-tests.php
On Wed, 19 Feb 2003, Jani Taskinen wrote: Which php.ini option controls this..? (AFAICS, this is available always, if the configure check succeeds) disable_functions=proc_open and I appeared to have that one here and so I got weird errors. Derick -- Stop mad cowboy disease! - Derick Rethans http://derickrethans.nl/ PHP Magazine - PHP Magazine for Professionals http://php-mag.net/ - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / NEWS
sniper Wed Feb 19 01:33:43 2003 EDT Modified files: /php4 NEWS Log: cleanup, documentation belongs elsewhere Index: php4/NEWS diff -u php4/NEWS:1.1345 php4/NEWS:1.1346 --- php4/NEWS:1.1345Tue Feb 18 20:32:20 2003 +++ php4/NEWS Wed Feb 19 01:33:43 2003 @@ -1,14 +1,6 @@ PHP 4 NEWS ||| ? ? ??? 200?, Version 5.0.0 -- Added new parameter to sha1() and md5() which return the digest as - binary data. (Michael Bretterklieber [EMAIL PROTECTED], Derick) -- Added proc_nice() function, which allows changing priority of the current - process. (Ilia) -- Added pcntl_getpriority() and pcntl_setpriority() functions, which can be - used to fetch and change priority of any process. (Ilia) -- Added idate(), date_sunrise() and date_sunset() functions. (Moshe Doron) -- Added support for long options in CLI CGI (e.g. --version). (Marcus) - Moved extensions to PECL (http://pear.php.net/): (James, Tal) . ext/fribidi - Fixed bug #21985 and #22064 (various mb_send_mail() issues). (Moriyoshi) @@ -21,22 +13,25 @@ - Changed is_executable() to be available also on Windows. (Shane) - Changed array_search() to accept also objects as a needle. (Moriyoshi) - Changed ext/mcrypt to require libmcrypt version 2.5.6 or greater. (Derick) -- Changed uniqid() parameters to be optional and allow any prefix length. - (Marcus) +- Changed uniqid() parameters to be optional and allow any prefix length. (Marcus) +- Added optional parameter to sha1() and md5() which makes them return + the digest as binary data. (Michael Bretterklieber [EMAIL PROTECTED], Derick) +- Added proc_nice() function. Changes priority of the current process. (Ilia) +- Added pcntl_getpriority() and pcntl_setpriority() functions. (Ilia) +- Added idate(), date_sunrise() and date_sunset() functions. (Moshe Doron) +- Added long options into CLI CGI (e.g. --version). (Marcus) - Added strpbrk() function. Searches a string for a list of characters. (Ilia) - Added stream_get_line() function. Reads either the specified number of bytes or until the ending string is found. (Ilia) -- Added optional parameter to mkdir() which makes directory creation recursive. - (Ilia) -- Added optional parameter to file() which can be used to make the result array - not contain the line endings and to skip empty lines. (Ilia) -- Added get_headers() function. Used to retrieve headers sent by the browser - for the specified URL. (Ilia) +- Added optional parameter to mkdir() to make directory creation recursive. (Ilia) +- Added optional parameter to file() which makes the result array not contain + the line endings and to skip empty lines. (Ilia) +- Added get_headers() function. Returns headers sent by the server of + the specified URL. (Ilia) - Added str_split() function. Breaks down a string into an array of elements based on length. (Ilia) -- Added array_walk_recursive() function. Applies user function recursively - to an array. (Ilia) -- Added command line parameters -B, -F, -R and -E which allow to process stdin +- Added array_walk_recursive() function. (Ilia) +- Added new command line parameters -B, -F, -R and -E which allow to process stdin line by line (See php -h for more). (Marcus) - Added string.base64 stream filter. (Moriyoshi) - Added domxml_node_get_path(). (Lukas Schröder) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/dba/libflatfile flatfile.h
sniper Wed Feb 19 01:35:57 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/dba/libflatfile flatfile.h
Log:
MFH: avoiding problems..
Index: php4/ext/dba/libflatfile/flatfile.h
diff -u php4/ext/dba/libflatfile/flatfile.h:1.4.2.3
php4/ext/dba/libflatfile/flatfile.h:1.4.2.4
--- php4/ext/dba/libflatfile/flatfile.h:1.4.2.3 Fri Jan 31 15:10:11 2003
+++ php4/ext/dba/libflatfile/flatfile.h Wed Feb 19 01:35:57 2003
@@ -16,10 +16,10 @@
+--+
*/
-/* $Id: flatfile.h,v 1.4.2.3 2003/01/31 20:10:11 helly Exp $ */
+/* $Id: flatfile.h,v 1.4.2.4 2003/02/19 06:35:57 sniper Exp $ */
-#ifndef PHP_LIBDBM_H
-#define PHP_LIBDBM_H
+#ifndef PHP_LIB_FLATFILE_H
+#define PHP_LIB_FLATFILE_H
typedef struct {
char *dptr;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/informix config.m4
nobbie Wed Feb 19 02:16:01 2003 EDT Modified files: /php4/ext/informix config.m4 Log: Updated IFX_VERSION entry to work with new Version output of ESQL/C @- Updated IFX_VERSION entry to work with new Version output of ESQL/C (Corne') Index: php4/ext/informix/config.m4 diff -u php4/ext/informix/config.m4:1.28 php4/ext/informix/config.m4:1.29 --- php4/ext/informix/config.m4:1.28Mon Jan 13 18:31:12 2003 +++ php4/ext/informix/config.m4 Wed Feb 19 02:16:00 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.28 2003/01/13 23:31:12 sniper Exp $ +dnl $Id: config.m4,v 1.29 2003/02/19 07:16:00 nobbie Exp $ dnl PHP_ARG_WITH(informix,for Informix support, @@ -44,7 +44,7 @@ esac AC_MSG_CHECKING([Informix version]) - IFX_VERSION=[`$INFORMIXDIR/bin/esql -V | sed -ne '1 s/^.*Version \([0-9]\)\.\([0-9]*\).*$/\1\2/p'`] + IFX_VERSION=[`$INFORMIXDIR/bin/esql -V | grep ESQL Version | sed -ne '1 +s/\(.*\)ESQL Version \([0-9]\)\.\([0-9]*\).*/\2\3/p'`] AC_MSG_RESULT($IFX_VERSION) AC_DEFINE_UNQUOTED(IFX_VERSION, $IFX_VERSION, [ ]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
