[slack-users] Mapple - Matemática - tem para Linux?
Alguém sabe se existe o Mapple para Linux? Ou algum similar? []'s Alexander -- GUS-BR - Grupo de Usuários Slackware - BR http://www.slackwarebrasil.org/ http://www.linuxmag.com.br/mailman/listinfo/slack-users
[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Fri Feb 20 20:32:45 2004 EDT Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.1544r2=1.1545ty=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.1544 php-src/ChangeLog:1.1545 --- php-src/ChangeLog:1.1544Thu Feb 19 20:32:34 2004 +++ php-src/ChangeLog Fri Feb 20 20:32:43 2004 @@ -1,3 +1,111 @@ +2004-02-20 Sara Golemon [EMAIL PROTECTED] + +* ext/ftp/ftp.c: + s_addr is always unsigned 32bit, long is not. + +* ext/standard/http.c: + Bug Fix #27335: Numeric indexes crashing http_build_query() + +2004-02-20 Greg Beaver [EMAIL PROTECTED] + +* pear/package-PEAR.xml + pear/package-PEAR.xml: + stupid oversight, no 4.2 dep + +2004-02-20 Pierre-Alain Joye [EMAIL PROTECTED] + +* (PHP_4_3) + pear/packages/DB-1.6.0.tar + pear/packages/DB-1.6.0RC6.tar: + - Update to DB-1.6.0 + +* pear/packages/DB-1.6.0RC6.tar: + - Remove DB 1.6.0RC6 + +* pear/packages/DB-1.6.0.tar: + + - Update to DB-1.6.0 stable + +* pear/package-PEAR.xml: + - MFB + +* (PHP_4_3) + pear/package-PEAR.xml: + - 1.3b6=1.3 stable, prepare stable release + +2004-02-20 Georg Richter [EMAIL PROTECTED] + +* ext/mysqli/config.m4 + ext/mysqli/mysqli_api.c + ext/mysqli/mysqli_repl.c: + Moved functions for replication support in to file mysqli_repl.c +- these functions are marked as experimental now in documentation + not sure if we will replace or extend them with NDB support in + April + +2004-02-20 Antony Dovgal [EMAIL PROTECTED] + +* ext/oci8/oci8.c: + this should really fix compile failure with gcc 2.96 + +2004-02-20 Ard Biesheuvel [EMAIL PROTECTED] + +* ext/interbase/interbase.c + ext/interbase/php_ibase_includes.h: + Fix some issues with persistent links + +2004-02-20 Hartmut Holzgraefe [EMAIL PROTECTED] + +* main/streams/php_stream_context.h + main/streams/php_stream_filter_api.h + main/streams/php_stream_mmap.h + main/streams/php_stream_plain_wrapper.h + main/streams/php_stream_transport.h: + EXTERN_C wrapping for PHPAPI prototypes + (Zend and main should now be ok) + +* main/php_memory_streams.h + main/php_network.h + main/php_open_temporary_file.h + main/php_output.h + main/php_reentrancy.h + main/php_streams.h + main/php_ticks.h + main/safe_mode.h: + wrap all PHPAPI prototypes into BEGIN_EXTERN_C/END_EXTERN_C blocks + (else they won't be usable from C++ extensions) + +* ZendEngine2/zend.h + ZendEngine2/zend_API.h + ZendEngine2/zend_iterators.h + ZendEngine2/zend_operators.h + ZendEngine2/zend_variables.h: + more EXTERN_C wrapping of ZEND_API prototypes + +* scripts/dev/extern_c.php: + A script that searches for PHPAPI and ZEND_API prototypes + not enclosed by BEGIN_EXTERN_C/END_EXTERN_C + +2004-02-20 Jani Taskinen [EMAIL PROTECTED] + +* ZendEngine2/zend_opcode.c: + ws fix + +* ext/oci8/oci8.c: + Fix compile failure + +* ext/oci8/oci8.c: + Only use Z_TYPE* with zvals.. + +2004-02-20 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_4_3) + ext/dio/dio.c: + MFH: missing safe_mode open_basedir checks. + +* ext/dio/dio.c: + Added missing safe_mode open_basedir checks. + 2004-02-19 Ilia Alshanetsky [EMAIL PROTECTED] * (PHP_4_3)
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Fri Feb 20 20:32:49 2004 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.410r2=1.411ty=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.410 ZendEngine2/ChangeLog:1.411 --- ZendEngine2/ChangeLog:1.410 Wed Feb 18 20:32:24 2004 +++ ZendEngine2/ChangeLog Fri Feb 20 20:32:48 2004 @@ -1,3 +1,17 @@ +2004-02-20 Hartmut Holzgraefe [EMAIL PROTECTED] + +* zend.h + zend_API.h + zend_iterators.h + zend_operators.h + zend_variables.h: + more EXTERN_C wrapping of ZEND_API prototypes + +2004-02-20 Jani Taskinen [EMAIL PROTECTED] + +* zend_opcode.c: + ws fix + 2004-02-18 Hartmut Holzgraefe [EMAIL PROTECTED] * zend.h @@ -3500,7 +3514,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.410 2004/02/19 01:32:24 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.411 2004/02/21 01:32:48 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -5224,7 +5238,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.410 2004/02/19 01:32:24 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.411 2004/02/21 01:32:48 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src /scripts/dev extern_c.php
hholzgraFri Feb 20 03:01:59 2004 EDT
Added files:
/php-src/scripts/devextern_c.php
Log:
A script that searches for PHPAPI and ZEND_API prototypes
not enclosed by BEGIN_EXTERN_C/END_EXTERN_C
http://cvs.php.net/co.php/php-src/scripts/dev/extern_c.php?r=1.1p=1
Index: php-src/scripts/dev/extern_c.php
+++ php-src/scripts/dev/extern_c.php
?php
function scan_dir($dir) {
if (!is_dir($dir)) return;
foreach (glob($dir/*) as $file) {
if (is_dir($file)) {
if (basename($file) != CVS) {
scan_dir($file);
}
} else if (fnmatch(*.h, $file)) {
scan_file($file);
}
}
}
function scan_file($file) {
$flag = false;
foreach (file($file) as $nr = $line) {
if (ereg(^[[:space:]]*BEGIN_EXTERN_C, $line)) {
# echo $file:.($nr+1). $line;
$flag = true;
} else if (ereg(^[[:space:]]*END_EXTERN_C, $line)) {
# echo $file:.($nr+1). $line;
$flag = false;
} else if ( (ereg(^[[:space:]]*PHPAPI[[:space:]]*, $line))
||(ereg(^[[:space:]]*ZEND_API[[:space:]]*,
$line))) {
if (strstr($line,()) {
if (!$flag) echo $file:.($nr+1). $line;
}
}
}
}
array_shift($_SERVER[argv]);
if (count($_SERVER[argv])) {
foreach ($_SERVER[argv] as $dir) {
scan_dir($dir);
}
} else {
scan_dir(.);
}
?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main php_memory_streams.h php_network.h php_open_temporary_file.h php_output.h php_reentrancy.h php_streams.h php_ticks.h safe_mode.h
hholzgraFri Feb 20 03:04:31 2004 EDT
Modified files:
/php-src/main php_memory_streams.h php_network.h
php_open_temporary_file.h php_output.h
php_reentrancy.h php_streams.h php_ticks.h
safe_mode.h
Log:
wrap all PHPAPI prototypes into BEGIN_EXTERN_C/END_EXTERN_C blocks
(else they won't be usable from C++ extensions)
http://cvs.php.net/diff.php/php-src/main/php_memory_streams.h?r1=1.10r2=1.11ty=u
Index: php-src/main/php_memory_streams.h
diff -u php-src/main/php_memory_streams.h:1.10 php-src/main/php_memory_streams.h:1.11
--- php-src/main/php_memory_streams.h:1.10 Thu Jan 8 12:33:04 2004
+++ php-src/main/php_memory_streams.h Fri Feb 20 03:04:30 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_memory_streams.h,v 1.10 2004/01/08 17:33:04 sniper Exp $ */
+/* $Id: php_memory_streams.h,v 1.11 2004/02/20 08:04:30 hholzgra Exp $ */
#ifndef PHP_MEMORY_STREAM_H
#define PHP_MEMORY_STREAM_H
@@ -38,13 +38,14 @@
#define php_stream_temp_create_rel(mode, max_memory_usage)
_php_stream_temp_create((mode), (max_memory_usage) STREAMS_REL_CC TSRMLS_CC)
#define php_stream_temp_open(mode, max_memory_usage, buf, length)
_php_stream_temp_open((mode), (max_memory_usage), (buf), (length) STREAMS_CC TSRMLS_CC)
-
+BEGIN_EXTERN_C()
PHPAPI php_stream *_php_stream_memory_create(int mode STREAMS_DC TSRMLS_DC);
PHPAPI php_stream *_php_stream_memory_open(int mode, char *buf, size_t length
STREAMS_DC TSRMLS_DC);
PHPAPI char *_php_stream_memory_get_buffer(php_stream *stream, size_t *length
STREAMS_DC TSRMLS_DC);
PHPAPI php_stream *_php_stream_temp_create(int mode, size_t max_memory_usage
STREAMS_DC TSRMLS_DC);
PHPAPI php_stream *_php_stream_temp_open(int mode, size_t max_memory_usage, char
*buf, size_t length STREAMS_DC TSRMLS_DC);
+END_EXTERN_C()
extern php_stream_ops php_stream_memory_ops;
extern php_stream_ops php_stream_temp_ops;
http://cvs.php.net/diff.php/php-src/main/php_network.h?r1=1.51r2=1.52ty=u
Index: php-src/main/php_network.h
diff -u php-src/main/php_network.h:1.51 php-src/main/php_network.h:1.52
--- php-src/main/php_network.h:1.51 Thu Jan 8 12:33:04 2004
+++ php-src/main/php_network.h Fri Feb 20 03:04:30 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_network.h,v 1.51 2004/01/08 17:33:04 sniper Exp $ */
+/* $Id: php_network.h,v 1.52 2004/02/20 08:04:30 hholzgra Exp $ */
#ifndef _PHP_NETWORK_H
#define _PHP_NETWORK_H
@@ -62,7 +62,9 @@
/* like strerror, but caller must efree the returned string,
* unless buf is not NULL.
* Also works sensibly for win32 */
+BEGIN_EXTERN_C()
PHPAPI char *php_socket_strerror(long err, char *buf, size_t bufsize);
+END_EXTERN_C()
#ifdef HAVE_NETINET_IN_H
# include netinet/in.h
@@ -120,6 +122,7 @@
} php_sockaddr_storage;
#endif
+BEGIN_EXTERN_C()
PHPAPI php_socket_t php_network_connect_socket_to_host(const char *host, unsigned
short port,
int socktype, int asynchronous, struct timeval *timeout, char
**error_string,
int *error_code
@@ -163,7 +166,7 @@
PHPAPI void php_any_addr(int family, php_sockaddr_storage *addr, unsigned short port);
PHPAPI int php_sockaddr_size(php_sockaddr_storage *addr);
-
+END_EXTERN_C()
struct _php_netstream_data_t {
php_socket_t socket;
@@ -177,6 +180,7 @@
extern php_stream_ops php_stream_generic_socket_ops;
#define PHP_STREAM_IS_SOCKET (php_stream_socket_ops)
+BEGIN_EXTERN_C()
PHPAPI php_stream *_php_stream_sock_open_from_socket(php_socket_t socket, const char
*persistent_id STREAMS_DC TSRMLS_DC );
/* open a connection to a host using php_hostconnect and return a stream */
PHPAPI php_stream *_php_stream_sock_open_host(const char *host, unsigned short port,
@@ -193,6 +197,7 @@
PHPAPI int php_network_parse_network_address_with_port(const char *addr,
long addrlen, struct sockaddr *sa, socklen_t *sl TSRMLS_DC);
+END_EXTERN_C()
#define php_stream_sock_open_from_socket(socket, persistent)
_php_stream_sock_open_from_socket((socket), (persistent) STREAMS_CC TSRMLS_CC)
#define php_stream_sock_open_host(host, port, socktype, timeout, persistent)
_php_stream_sock_open_host((host), (port), (socktype), (timeout), (persistent)
STREAMS_CC TSRMLS_CC)
http://cvs.php.net/diff.php/php-src/main/php_open_temporary_file.h?r1=1.10r2=1.11ty=u
Index: php-src/main/php_open_temporary_file.h
diff -u php-src/main/php_open_temporary_file.h:1.10
php-src/main/php_open_temporary_file.h:1.11
--- php-src/main/php_open_temporary_file.h:1.10 Thu Jan 8 12:33:04 2004
+++ php-src/main/php_open_temporary_file.h Fri Feb 20 03:04:30 2004
@@ -16,12 +16,14 @@
+--+
*/
-/* $Id: php_open_temporary_file.h,v 1.10 2004/01/08 17:33:04
[PHP-CVS] cvs: php-src /main/streams php_stream_context.h php_stream_filter_api.h php_stream_mmap.h php_stream_plain_wrapper.h php_stream_transport.h
hholzgraFri Feb 20 03:22:16 2004 EDT
Modified files:
/php-src/main/streams php_stream_context.h php_stream_filter_api.h
php_stream_mmap.h php_stream_plain_wrapper.h
php_stream_transport.h
Log:
EXTERN_C wrapping for PHPAPI prototypes
(Zend and main should now be ok)
http://cvs.php.net/diff.php/php-src/main/streams/php_stream_context.h?r1=1.8r2=1.9ty=u
Index: php-src/main/streams/php_stream_context.h
diff -u php-src/main/streams/php_stream_context.h:1.8
php-src/main/streams/php_stream_context.h:1.9
--- php-src/main/streams/php_stream_context.h:1.8 Thu Jan 8 12:33:06 2004
+++ php-src/main/streams/php_stream_context.h Fri Feb 20 03:22:12 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_stream_context.h,v 1.8 2004/01/08 17:33:06 sniper Exp $ */
+/* $Id: php_stream_context.h,v 1.9 2004/02/20 08:22:12 hholzgra Exp $ */
/* Stream context and status notification related definitions */
@@ -57,6 +57,7 @@
int rsrc_id;/* used for auto-cleanup */
};
+BEGIN_EXTERN_C()
PHPAPI void php_stream_context_free(php_stream_context *context);
PHPAPI php_stream_context *php_stream_context_alloc(void);
PHPAPI int php_stream_context_get_option(php_stream_context *context,
@@ -73,6 +74,7 @@
PHPAPI php_stream_notifier *php_stream_notification_alloc(void);
PHPAPI void php_stream_notification_free(php_stream_notifier *notifier);
+END_EXTERN_C()
/* not all notification codes are implemented */
#define PHP_STREAM_NOTIFY_RESOLVE 1
@@ -90,9 +92,11 @@
#define PHP_STREAM_NOTIFY_SEVERITY_WARN1
#define PHP_STREAM_NOTIFY_SEVERITY_ERR 2
+BEGIN_EXTERN_C()
PHPAPI void php_stream_notification_notify(php_stream_context *context, int
notifycode, int severity,
char *xmsg, int xcode, size_t bytes_sofar, size_t bytes_max, void *
ptr TSRMLS_DC);
PHPAPI php_stream_context *php_stream_context_set(php_stream *stream,
php_stream_context *context);
+END_EXTERN_C()
#define php_stream_notify_info(context, code, xmsg, xcode) do { if ((context)
(context)-notifier) { \
php_stream_notification_notify((context), (code),
PHP_STREAM_NOTIFY_SEVERITY_INFO, \
http://cvs.php.net/diff.php/php-src/main/streams/php_stream_filter_api.h?r1=1.6r2=1.7ty=u
Index: php-src/main/streams/php_stream_filter_api.h
diff -u php-src/main/streams/php_stream_filter_api.h:1.6
php-src/main/streams/php_stream_filter_api.h:1.7
--- php-src/main/streams/php_stream_filter_api.h:1.6Thu Jan 8 12:33:06 2004
+++ php-src/main/streams/php_stream_filter_api.hFri Feb 20 03:22:12 2004
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: php_stream_filter_api.h,v 1.6 2004/01/08 17:33:06 sniper Exp $ */
+/* $Id: php_stream_filter_api.h,v 1.7 2004/02/20 08:22:12 hholzgra Exp $ */
/* The filter API works on the principle of Bucket-Brigades. This is
* partially inspired by the Apache 2 method of doing things, although
@@ -66,6 +66,7 @@
} php_stream_filter_status_t;
/* Buckets API. */
+BEGIN_EXTERN_C()
PHPAPI php_stream_bucket *php_stream_bucket_new(php_stream *stream, char *buf, size_t
buflen, int own_buf, int buf_persistent TSRMLS_DC);
PHPAPI int php_stream_bucket_split(php_stream_bucket *in, php_stream_bucket **left,
php_stream_bucket **right, size_t length TSRMLS_DC);
PHPAPI void php_stream_bucket_delref(php_stream_bucket *bucket TSRMLS_DC);
@@ -74,6 +75,7 @@
PHPAPI void php_stream_bucket_append(php_stream_bucket_brigade *brigade,
php_stream_bucket *bucket TSRMLS_DC);
PHPAPI void php_stream_bucket_unlink(php_stream_bucket *bucket TSRMLS_DC);
PHPAPI php_stream_bucket *php_stream_bucket_make_writeable(php_stream_bucket *bucket
TSRMLS_DC);
+END_EXTERN_C()
#define PSFS_FLAG_NORMAL 0 /* regular read/write */
#define PSFS_FLAG_FLUSH_INC1 /* an incremental flush */
@@ -115,11 +117,13 @@
};
/* stack filter onto a stream */
+BEGIN_EXTERN_C()
PHPAPI void php_stream_filter_prepend(php_stream_filter_chain *chain,
php_stream_filter *filter);
PHPAPI void php_stream_filter_append(php_stream_filter_chain *chain,
php_stream_filter *filter);
PHPAPI php_stream_filter *php_stream_filter_remove(php_stream_filter *filter, int
call_dtor TSRMLS_DC);
PHPAPI void php_stream_filter_free(php_stream_filter *filter TSRMLS_DC);
PHPAPI php_stream_filter *_php_stream_filter_alloc(php_stream_filter_ops *fops, void
*abstract, int persistent STREAMS_DC TSRMLS_DC);
+END_EXTERN_C()
#define php_stream_filter_alloc(fops, thisptr, persistent)
_php_stream_filter_alloc((fops), (thisptr), (persistent) STREAMS_CC TSRMLS_CC)
#define php_stream_filter_alloc_rel(fops, thisptr, persistent)
_php_stream_filter_alloc((fops), (thisptr), (persistent) STREAMS_REL_CC TSRMLS_CC)
@@ -129,9 +133,11 @@
php_stream_filter
[PHP-CVS] cvs: php-src /ext/interbase interbase.c php_ibase_includes.h
abies Fri Feb 20 05:59:24 2004 EDT
Modified files:
/php-src/ext/interbase interbase.c php_ibase_includes.h
Log:
Fix some issues with persistent links
http://cvs.php.net/diff.php/php-src/ext/interbase/interbase.c?r1=1.202r2=1.203ty=u
Index: php-src/ext/interbase/interbase.c
diff -u php-src/ext/interbase/interbase.c:1.202 php-src/ext/interbase/interbase.c:1.203
--- php-src/ext/interbase/interbase.c:1.202 Tue Feb 17 07:53:53 2004
+++ php-src/ext/interbase/interbase.c Fri Feb 20 05:59:23 2004
@@ -14,11 +14,11 @@
+--+
| Authors: Jouni Ahto [EMAIL PROTECTED]|
| Andrew Avdeev [EMAIL PROTECTED] |
- | Ard Biesheuvel [EMAIL PROTECTED] |
+ | Ard Biesheuvel [EMAIL PROTECTED] |
+--+
*/
-/* $Id: interbase.c,v 1.202 2004/02/17 12:53:53 abies Exp $ */
+/* $Id: interbase.c,v 1.203 2004/02/20 10:59:23 abies Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -30,12 +30,13 @@
#include php.h
-#define FILE_REVISION $Revision: 1.202 $
+#define FILE_REVISION $Revision: 1.203 $
#if HAVE_IBASE
#include php_ini.h
#include ext/standard/php_standard.h
+#include ext/standard/md5.h
#include php_interbase.h
#include php_ibase_includes.h
@@ -49,10 +50,8 @@
#define IBDEBUG(a)
#endif
-#define SAFE_STRING(s) ((s)?(s):)
-
-#define ISC_LONG_MIN (-ISC_LONG_MAX - 1)
-#define ISC_LONG_MAX 2147483647
+#define ISC_LONG_MIN (1 (8*sizeof(ISC_LONG)-1))
+#define ISC_LONG_MAX ~ISC_LONG_MIN
#define QUERY_RESULT 1
#define EXECUTE_RESULT 2
@@ -64,8 +63,6 @@
#define FETCH_ROW 1
#define FETCH_ARRAY2
-#define HASH_MASK ibase_%s_%s_%s_%s_%s_%s_%s
-
/* {{{ extension definition structures */
function_entry ibase_functions[] = {
PHP_FE(ibase_connect, NULL)
@@ -581,8 +578,10 @@
STD_PHP_INI_BOOLEAN(ibase.allow_persistent, 1, PHP_INI_SYSTEM,
OnUpdateLong, allow_persistent, zend_ibase_globals, ibase_globals)
STD_PHP_INI_ENTRY_EX(ibase.max_persistent, -1, PHP_INI_SYSTEM,
OnUpdateLong, max_persistent, zend_ibase_globals, ibase_globals, display_link_numbers)
STD_PHP_INI_ENTRY_EX(ibase.max_links, -1, PHP_INI_SYSTEM, OnUpdateLong,
max_links, zend_ibase_globals, ibase_globals, display_link_numbers)
+ STD_PHP_INI_ENTRY(ibase.default_db, NULL, PHP_INI_SYSTEM, OnUpdateString,
default_db, zend_ibase_globals, ibase_globals)
STD_PHP_INI_ENTRY(ibase.default_user, NULL, PHP_INI_ALL, OnUpdateString,
default_user, zend_ibase_globals, ibase_globals)
STD_PHP_INI_ENTRY(ibase.default_password, NULL, PHP_INI_ALL, OnUpdateString,
default_password, zend_ibase_globals, ibase_globals)
+ STD_PHP_INI_ENTRY(ibase.default_charset, NULL, PHP_INI_ALL, OnUpdateString,
default_charset, zend_ibase_globals, ibase_globals)
STD_PHP_INI_ENTRY(ibase.timestampformat, %m/%d/%Y %H:%M:%S, PHP_INI_ALL,
OnUpdateString, cfg_timestampformat, zend_ibase_globals, ibase_globals)
STD_PHP_INI_ENTRY(ibase.dateformat, %m/%d/%Y, PHP_INI_ALL, OnUpdateString,
cfg_dateformat, zend_ibase_globals, ibase_globals)
STD_PHP_INI_ENTRY(ibase.timeformat, %H:%M:%S, PHP_INI_ALL, OnUpdateString,
cfg_timeformat, zend_ibase_globals, ibase_globals)
@@ -839,60 +838,31 @@
}
/* }}} */
-int _php_ibase_attach_db(char *server, char *uname, char *passwd, char *charset, /*
{{{ */
- int buffers, char *role, isc_db_handle *db TSRMLS_DC)
+enum connect_args { DB = 0, USER = 1, PASS = 2, CSET = 3, ROLE = 4, BUF = 0, DLECT =
1 };
+
+static char const dpb_args[] = { 0, isc_dpb_user_name, isc_dpb_password,
isc_dpb_lc_ctype
+#ifdef isc_dpb_sql_role_name
+ , isc_dpb_sql_role_name
+#endif
+};
+
+int _php_ibase_attach_db(char **args, int *len, long *largs, isc_db_handle *db
TSRMLS_DC)
{
- char dpb_buffer[256], *dpb, *p;
- int dpb_length, len;
-
- dpb = dpb_buffer;
-
- *dpb++ = isc_dpb_version1;
-
- if (uname != NULL (len = strlen(uname))) {
- *dpb++ = isc_dpb_user_name;
- *dpb++ = len;
- for (p = uname; *p;) {
- *dpb++ = *p++;
- }
- }
+ short i;
+ char dpb_buffer[256] = { isc_dpb_version1 }, *dpb;
- if (passwd != NULL (len = strlen(passwd))) {
- *dpb++ = isc_dpb_password;
- *dpb++ = strlen(passwd);
- for (p = passwd; *p;) {
- *dpb++ = *p++;
- }
- }
+ dpb = dpb_buffer + 1;
- if (charset != NULL (len = strlen(charset))) {
- *dpb++ = isc_dpb_lc_ctype;
- *dpb++ = strlen(charset);
- for (p = charset; *p;) {
- *dpb++ = *p++;
+ for (i = 0; i
[PHP-CVS] cvs: php-src /ext/oci8 oci8.c
tony2001Fri Feb 20 07:47:56 2004 EDT
Modified files:
/php-src/ext/oci8 oci8.c
Log:
this should really fix compile failure with gcc 2.96
http://cvs.php.net/diff.php/php-src/ext/oci8/oci8.c?r1=1.252r2=1.253ty=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.252 php-src/ext/oci8/oci8.c:1.253
--- php-src/ext/oci8/oci8.c:1.252 Thu Feb 19 22:16:51 2004
+++ php-src/ext/oci8/oci8.c Fri Feb 20 07:47:56 2004
@@ -22,7 +22,7 @@
+--+
*/
-/* $Id: oci8.c,v 1.252 2004/02/20 03:16:51 sniper Exp $ */
+/* $Id: oci8.c,v 1.253 2004/02/20 12:47:56 tony2001 Exp $ */
/* TODO list:
*
@@ -786,7 +786,7 @@
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.252 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.253 $);
sprintf(buf, %ld, num_persistent);
php_info_print_table_row(2, Active Persistent Links, buf);
@@ -836,9 +836,9 @@
*/
static void _oci_desc_flush_hash_dtor(void *data)
{
+ oci_descriptor *descr = *(oci_descriptor **)data;
TSRMLS_FETCH();
- oci_descriptor *descr = *(oci_descriptor **)data;
if (descr-buffering == 2 (descr-type == OCI_DTYPE_LOB || descr-type ==
OCI_DTYPE_FILE)) {
oci_lob_flush(descr,OCI_LOB_BUFFER_FREE TSRMLS_CC);
descr-buffering = 1;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli config.m4 mysqli_api.c mysqli_repl.c
georg Fri Feb 20 08:09:15 2004 EDT
Added files:
/php-src/ext/mysqli mysqli_repl.c
Modified files:
/php-src/ext/mysqli config.m4 mysqli_api.c
Log:
Moved functions for replication support in to file mysqli_repl.c
- these functions are marked as experimental now in documentation
not sure if we will replace or extend them with NDB support in
April
http://cvs.php.net/diff.php/php-src/ext/mysqli/config.m4?r1=1.13r2=1.14ty=u
Index: php-src/ext/mysqli/config.m4
diff -u php-src/ext/mysqli/config.m4:1.13 php-src/ext/mysqli/config.m4:1.14
--- php-src/ext/mysqli/config.m4:1.13 Fri Dec 12 19:28:21 2003
+++ php-src/ext/mysqli/config.m4Fri Feb 20 08:09:14 2004
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.13 2003/12/13 00:28:21 georg Exp $
+dnl $Id: config.m4,v 1.14 2004/02/20 13:09:14 georg Exp $
dnl config.m4 for extension mysqli
PHP_ARG_WITH(mysqli, for MySQLi support,
@@ -50,6 +50,6 @@
$MYSQLI_LIBLINE
])
- PHP_NEW_EXTENSION(mysqli, mysqli.c mysqli_api.c mysqli_prop.c mysqli_nonapi.c
mysqli_fe.c mysqli_report.c, $ext_shared)
+ PHP_NEW_EXTENSION(mysqli, mysqli.c mysqli_api.c mysqli_prop.c mysqli_nonapi.c
mysqli_fe.c mysqli_report.c mysqli_repl.c, $ext_shared)
PHP_SUBST(MYSQLI_SHARED_LIBADD)
fi
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.72r2=1.73ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.72 php-src/ext/mysqli/mysqli_api.c:1.73
--- php-src/ext/mysqli/mysqli_api.c:1.72Wed Feb 18 08:26:57 2004
+++ php-src/ext/mysqli/mysqli_api.c Fri Feb 20 08:09:14 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_api.c,v 1.72 2004/02/18 13:26:57 georg Exp $
+ $Id: mysqli_api.c,v 1.73 2004/02/20 13:09:14 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -469,38 +469,6 @@
}
/* }}} */
-/* {{{ proto void mysqli_disable_reads_from_master(object link)
-*/
-PHP_FUNCTION(mysqli_disable_reads_from_master)
-{
- MYSQL *mysql;
- zval*mysql_link;
-
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), O,
mysql_link, mysqli_link_class_entry) == FAILURE) {
- return;
- }
- MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, mysql_link, mysqli_link);
- mysql_disable_reads_from_master(mysql);
- RETURN_TRUE;
-}
-/* }}} */
-
-/* {{{ proto void mysqli_disable_rpl_parse(object link)
-*/
-PHP_FUNCTION(mysqli_disable_rpl_parse)
-{
- MYSQL *mysql;
- zval*mysql_link;
-
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), O,
mysql_link, mysqli_link_class_entry) == FAILURE) {
- return;
- }
- MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, mysql_link, mysqli_link);
- mysql_disable_rpl_parse(mysql);
- RETURN_TRUE;
-}
-/* }}} */
-
/* {{{ proto bool mysqli_dump_debug_info(object link)
*/
PHP_FUNCTION(mysqli_dump_debug_info)
@@ -523,40 +491,6 @@
}
/* }}} */
-/* {{{ proto void mysqli_enable_reads_from_master(object link)
-*/
-PHP_FUNCTION(mysqli_enable_reads_from_master)
-{
- MYSQL *mysql;
- zval*mysql_link;
-
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), O,
mysql_link, mysqli_link_class_entry) == FAILURE) {
- return;
- }
- MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, mysql_link, mysqli_link);
-
- mysql_enable_reads_from_master(mysql);
- RETURN_TRUE;
-}
-/* }}} */
-
-/* {{{ proto void mysqli_enable_rpl_parse(object link)
-*/
-PHP_FUNCTION(mysqli_enable_rpl_parse)
-{
- MYSQL *mysql;
- zval*mysql_link;
-
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), O,
mysql_link, mysqli_link_class_entry) == FAILURE) {
- return;
- }
- MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, mysql_link, mysqli_link);
-
- mysql_enable_rpl_parse(mysql);
- RETURN_TRUE;
-}
-/* }}} */
-
/* {{{ proto int mysqli_errno(object link)
Returns the numerical value of the error message from previous MySQL operation */
PHP_FUNCTION(mysqli_errno)
@@ -1084,26 +1018,6 @@
}
/* }}} */
-/* {{{ proto bool mysqli_master_query(object link, string query)
- Enforce execution of a query on the master in a master/slave setup */
-PHP_FUNCTION(mysqli_master_query) {
- MYSQL *mysql;
- zval*mysql_link;
- char*query = NULL;
- unsigned intquery_len;
-
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), Os,
mysql_link, mysqli_link_class_entry, query, query_len) == FAILURE) {
- return;
- }
- MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, mysql_link, mysqli_link);
-
- if
[PHP-CVS] cvs: php-src /ext/soap php_http.c
dmitry Fri Feb 20 10:38:40 2004 EDT
Modified files:
/php-src/ext/soap php_http.c
Log:
BUGFIX: bug in HTTP chunked encoding was fixed
http://cvs.php.net/diff.php/php-src/ext/soap/php_http.c?r1=1.44r2=1.45ty=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.44 php-src/ext/soap/php_http.c:1.45
--- php-src/ext/soap/php_http.c:1.44Thu Feb 19 11:49:50 2004
+++ php-src/ext/soap/php_http.c Fri Feb 20 10:38:39 2004
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_http.c,v 1.44 2004/02/19 16:49:50 dmitry Exp $ */
+/* $Id: php_http.c,v 1.45 2004/02/20 15:38:39 dmitry Exp $ */
#include php_soap.h
#include ext/standard/base64.h
@@ -662,11 +662,11 @@
while (!done) {
int buf_size = 0;
- php_stream_gets(stream, chunk_size, sizeof(chunk_size));
+ php_stream_gets(stream, chunk_size, sizeof(chunk_size));
if (sscanf(chunk_size, %x, buf_size) 0 ) {
if (buf_size 0) {
int len_size = 0;
-
+
http_buf = erealloc(http_buf, http_buf_size +
buf_size + 1);
while (len_size buf_size) {
@@ -677,14 +677,14 @@
break;
}
len_size += len_read;
- http_buf_size += len_size;
+ http_buf_size += len_read;
}
}
-
+
/* Eat up '\r' '\n' */
php_stream_getc(stream);
php_stream_getc(stream);
- } else {
+ } else {
/* Somthing wrong in chunked encoding */
efree(http_buf);
return FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard http.c
pollita Fri Feb 20 15:38:16 2004 EDT
Modified files:
/php-src/ext/standard http.c
Log:
Bug Fix #27335: Numeric indexes crashing http_build_query()
http://cvs.php.net/diff.php/php-src/ext/standard/http.c?r1=1.11r2=1.12ty=u
Index: php-src/ext/standard/http.c
diff -u php-src/ext/standard/http.c:1.11 php-src/ext/standard/http.c:1.12
--- php-src/ext/standard/http.c:1.11Thu Jan 8 03:17:32 2004
+++ php-src/ext/standard/http.c Fri Feb 20 15:38:14 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: http.c,v 1.11 2004/01/08 08:17:32 andi Exp $ */
+/* $Id: http.c,v 1.12 2004/02/20 20:38:14 pollita Exp $ */
#include php_http.h
#include php_ini.h
@@ -59,9 +59,9 @@
/* We don't want that trailing NULL */
key_len -= 1;
}
-
+
/* handling for private protected object properties */
- if (*key == '\0' type != NULL) {
+ if (key *key == '\0' type != NULL) {
char *tmp;
zend_object *zobj = zend_objects_get_address(type TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/ftp ftp.c
pollita Fri Feb 20 16:09:09 2004 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/ftpftp.c /php-srcNEWS Log: MFH: long is not always 32-bit http://cvs.php.net/diff.php/php-src/ext/ftp/ftp.c?r1=1.68.2.12r2=1.68.2.13ty=u Index: php-src/ext/ftp/ftp.c diff -u php-src/ext/ftp/ftp.c:1.68.2.12 php-src/ext/ftp/ftp.c:1.68.2.13 --- php-src/ext/ftp/ftp.c:1.68.2.12 Tue Jan 13 13:59:08 2004 +++ php-src/ext/ftp/ftp.c Fri Feb 20 16:09:07 2004 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: ftp.c,v 1.68.2.12 2004/01/13 18:59:08 sniper Exp $ */ +/* $Id: ftp.c,v 1.68.2.13 2004/02/20 21:09:07 pollita Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -638,7 +638,7 @@ sin = (struct sockaddr_in *) sa; sin-sin_family = AF_INET; - sin-sin_addr.s_addr = ipbox.l[0]; + memcpy((sin-sin_addr.s_addr), (ipbox.c[0]), 4); sin-sin_port = ipbox.s[2]; ftp-pasv = 2; @@ -1328,7 +1328,7 @@ #endif /* send the PORT */ - ipbox.l[0] = ((struct sockaddr_in*) sa)-sin_addr.s_addr; + memcpy((ipbox.c[0]), (((struct sockaddr_in*) sa)-sin_addr.s_addr), 4); ipbox.s[2] = ((struct sockaddr_in*) addr)-sin_port; sprintf(arg, %u,%u,%u,%u,%u,%u, ipbox.c[0], ipbox.c[1], ipbox.c[2], ipbox.c[3], http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.571r2=1.1247.2.572ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.571 php-src/NEWS:1.1247.2.572 --- php-src/NEWS:1.1247.2.571 Wed Feb 18 14:49:15 2004 +++ php-src/NEWSFri Feb 20 16:09:08 2004 @@ -1,6 +1,7 @@ PHP 4 NEWS ||| ?? Feb 2004, Version 4.3.5 +- Fixed bug #27328 (ftp extension relies on 32-bit longs). (Sara) - Fixed bug #27295 (memory leak inside sscanf()). (Ilia) - Fixed bug #27293 (two crashes inside image2wbmp()). (Ilia) - Fixed bug #27278 (*printf() functions treat arguments as if passed by -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: cvs: php-src /ext/ftp ftp.c
Sara Golemon wrote: pollita Fri Feb 20 16:05:37 2004 EDT Modified files: /php-src/ext/ftp ftp.c Log: s_addr is always unsigned 32bit, long is not. + /* Deal with differing integer sizes */ + memcpy((sin-sin_addr.s_addr), (ipbox.c[0]), 4); Hi Sara, What's wrong with (int)ipbox.l[0] ? (as sizeof(int) == 4, even if sizeof(long) is not) -- Ard -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] Re: cvs: php-src /ext/ftp ftp.c
At 23:16 20/02/2004 +0100, Ard Biesheuvel wrote: Sara Golemon wrote: pollita Fri Feb 20 16:05:37 2004 EDT Modified files: /php-src/ext/ftpftp.c Log: s_addr is always unsigned 32bit, long is not. + /* Deal with differing integer sizes */ + memcpy((sin-sin_addr.s_addr), (ipbox.c[0]), 4); Hi Sara, What's wrong with (int)ipbox.l[0] ? (as sizeof(int) == 4, even if sizeof(long) is not) Yep. This memcpy() doesn't look very good. It seems to me that it could screw up depending on the endian-ness of the machine. I'd also go for the cast. Andi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] Re: cvs: php-src /ext/ftp ftp.c
Andi Gutmans wrote: At 23:16 20/02/2004 +0100, Ard Biesheuvel wrote: Sara Golemon wrote: pollita Fri Feb 20 16:05:37 2004 EDT Modified files: /php-src/ext/ftpftp.c Log: s_addr is always unsigned 32bit, long is not. + /* Deal with differing integer sizes */ + memcpy((sin-sin_addr.s_addr), (ipbox.c[0]), 4); Hi Sara, What's wrong with (int)ipbox.l[0] ? (as sizeof(int) == 4, even if sizeof(long) is not) Yep. This memcpy() doesn't look very good. It seems to me that it could screw up depending on the endian-ness of the machine. I'd also go for the cast. After taking a second look, I realised my suggestion is incorrect. Byte order is not an issue here, because sin-sin_addr.s_addr and the ipbox are both in network byte order. Couldn't you just replace the long member in the union by an integer ? (Just like the bug reporter suggested ?) -- Ard -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] Re: cvs: php-src /ext/ftp ftp.c
After taking a second look, I realised my suggestion is incorrect. Byte order is not an issue here, because sin-sin_addr.s_addr and the ipbox are both in network byte order. Couldn't you just replace the long member in the union by an integer ? (Just like the bug reporter suggested ?) Some 64-bit platforms define int as a 64-bit value. The exact same problem would present itself as currently does with long. If there were a u32 type reliably defined then it'd be a different story. Thought I'd mentioned the always network byte order of both the ipbox union and s_addr in the cvs commit, but looking back I noticed I must've only said that in IRC. Sorry... -Sara -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli mysqli_fe.c
georg Sat Feb 21 02:37:42 2004 EDT Modified files: /php-src/ext/mysqli mysqli_fe.c Log: fixed typo in method alias http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_fe.c?r1=1.28r2=1.29ty=u Index: php-src/ext/mysqli/mysqli_fe.c diff -u php-src/ext/mysqli/mysqli_fe.c:1.28 php-src/ext/mysqli/mysqli_fe.c:1.29 --- php-src/ext/mysqli/mysqli_fe.c:1.28 Wed Jan 28 17:51:54 2004 +++ php-src/ext/mysqli/mysqli_fe.c Sat Feb 21 02:37:41 2004 @@ -15,7 +15,7 @@ | Author: Georg Richter [EMAIL PROTECTED]| +--+ - $Id: mysqli_fe.c,v 1.28 2004/01/28 22:51:54 georg Exp $ + $Id: mysqli_fe.c,v 1.29 2004/02/21 07:37:41 georg Exp $ */ #ifdef HAVE_CONFIG_H @@ -210,7 +210,7 @@ PHP_FALIAS(data_seek,mysqli_data_seek,NULL) PHP_FALIAS(fetch_field,mysqli_fetch_field,NULL) PHP_FALIAS(fetch_fields,mysqli_fetch_fields,NULL) - PHP_FALIAS(fetvh_field_direct,mysqli_fetch_field_direct,NULL) + PHP_FALIAS(fetch_field_direct,mysqli_fetch_field_direct,NULL) PHP_FALIAS(fetch_array,mysqli_fetch_array,NULL) PHP_FALIAS(fetch_assoc,mysqli_fetch_assoc,NULL) PHP_FALIAS(fetch_object,mysqli_fetch_object,NULL) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
