Re: [PHP-CVS] cvs: php-src /ext/mysqli/tests 017.phpt 019.phpt 020.phpt 021.phpt 022.phpt 023.phpt 024.phpt 025.phpt 026.phpt 042.phpt 043.phpt 046.phpt 058.phpt 059.phpt
Are all these printf's in on purpose? Andi At 07:39 AM 2/11/2004 +, Georg Richter wrote: georg Wed Feb 11 02:39:28 2004 EDT Modified files: /php-src/ext/mysqli/tests 017.phpt 019.phpt 020.phpt 021.phpt 022.phpt 023.phpt 024.phpt 025.phpt 026.phpt 042.phpt 043.phpt 046.phpt 058.phpt 059.phpt Log: changed first param in mysqli_bind_param -- 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
Re: [PHP-CVS] cvs: php-src /ext/mysqli/tests 017.phpt 019.phpt 020.phpt 021.phpt 022.phpt 023.phpt 024.phpt 025.phpt 026.phpt 042.phpt 043.phpt 046.phpt 058.phpt 059.phpt
Are all these printf's in on purpose? Yes :) Georg -- 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.c mysqli_api.c
georg Wed Feb 11 03:34:10 2004 EDT
Modified files:
/php-src/ext/mysqli mysqli_api.c mysqli.c
Log:
removed printfs :)
Thx Andi!
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.69r2=1.70ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.69 php-src/ext/mysqli/mysqli_api.c:1.70
--- php-src/ext/mysqli/mysqli_api.c:1.69Wed Feb 11 02:38:43 2004
+++ php-src/ext/mysqli/mysqli_api.c Wed Feb 11 03:34:07 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_api.c,v 1.69 2004/02/11 07:38:43 georg Exp $
+ $Id: mysqli_api.c,v 1.70 2004/02/11 08:34:07 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1261,8 +1261,6 @@
RETURN_FALSE;
}
- if (stmt-stmt-fields) printf(**\n);
-
mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));
mysqli_resource-ptr = (void *)stmt;
MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_stmt_class_entry);
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli.c?r1=1.29r2=1.30ty=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.29 php-src/ext/mysqli/mysqli.c:1.30
--- php-src/ext/mysqli/mysqli.c:1.29Wed Feb 11 02:38:43 2004
+++ php-src/ext/mysqli/mysqli.c Wed Feb 11 03:34:08 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli.c,v 1.29 2004/02/11 07:38:43 georg Exp $
+ $Id: mysqli.c,v 1.30 2004/02/11 08:34:08 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -66,7 +66,6 @@
for (i=0; i bbuf.var_cnt; i++) {
if (type == FETCH_RESULT) {
if (bbuf.buf[i].type == IS_STRING) {
- printf (--free--\n);
efree(bbuf.buf[i].buffer);
}
}
--
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
zeevWed Feb 11 06:46:21 2004 EDT
Modified files:
/php-src/ext/standard dl.c
Log:
Finally add a notice to hint people that using dl() is a bad idea...
http://cvs.php.net/diff.php/php-src/ext/standard/dl.c?r1=1.86r2=1.87ty=u
Index: php-src/ext/standard/dl.c
diff -u php-src/ext/standard/dl.c:1.86 php-src/ext/standard/dl.c:1.87
--- php-src/ext/standard/dl.c:1.86 Thu Jan 8 03:17:31 2004
+++ php-src/ext/standard/dl.c Wed Feb 11 06:46:20 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dl.c,v 1.86 2004/01/08 08:17:31 andi Exp $ */
+/* $Id: dl.c,v 1.87 2004/02/11 11:46:20 zeev Exp $ */
#include php.h
#include dl.h
@@ -81,6 +81,7 @@
} else if (PG(safe_mode)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Dynamically loaded
extensions aren't allowed when running in Safe Mode);
} else {
+ zend_error(E_STRICT, dl() is deprecated - use extension= in your
php.ini);
php_dl(*file, MODULE_TEMPORARY, return_value TSRMLS_CC);
EG(full_tables_cleanup) = 1;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /main php_version.h
andiWed Feb 11 06:53:45 2004 EDT Modified files: /php-srcconfigure.in /php-src/main php_version.h Log: - Change to b4 http://cvs.php.net/diff.php/php-src/configure.in?r1=1.490r2=1.491ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.490 php-src/configure.in:1.491 --- php-src/configure.in:1.490 Sat Jan 17 07:59:11 2004 +++ php-src/configure.inWed Feb 11 06:53:44 2004 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.490 2004/01/17 12:59:11 sniper Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.491 2004/02/11 11:53:44 andi Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -41,7 +41,7 @@ MAJOR_VERSION=5 MINOR_VERSION=0 RELEASE_VERSION=0 -EXTRA_VERSION=RC1-dev +EXTRA_VERSION=b4-dev VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION dnl Define where extension directories are located in the configure context http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.78r2=1.79ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.78 php-src/main/php_version.h:1.79 --- php-src/main/php_version.h:1.78 Sun Dec 21 13:57:58 2003 +++ php-src/main/php_version.h Wed Feb 11 06:53:45 2004 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 0 #define PHP_RELEASE_VERSION 0 -#define PHP_EXTRA_VERSION RC1-dev -#define PHP_VERSION 5.0.0RC1-dev +#define PHP_EXTRA_VERSION b4-dev +#define PHP_VERSION 5.0.0b4-dev -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/interbase ibase_events.c ibase_service.c
abies Wed Feb 11 06:59:08 2004 EDT
Modified files:
/php-src/ext/interbase ibase_events.c ibase_service.c
Log:
CS/WS
http://cvs.php.net/diff.php/php-src/ext/interbase/ibase_events.c?r1=1.3r2=1.4ty=u
Index: php-src/ext/interbase/ibase_events.c
diff -u php-src/ext/interbase/ibase_events.c:1.3
php-src/ext/interbase/ibase_events.c:1.4
--- php-src/ext/interbase/ibase_events.c:1.3Mon Feb 2 08:47:56 2004
+++ php-src/ext/interbase/ibase_events.cWed Feb 11 06:59:08 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: ibase_events.c,v 1.3 2004/02/02 13:47:56 abies Exp $ */
+/* $Id: ibase_events.c,v 1.4 2004/02/11 11:59:08 abies Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -36,8 +36,8 @@
}
/* }}} */
-static void _php_ibase_event_block(ibase_db_link *ib_link, unsigned short count, char
**events,
- unsigned short *l, char **event_buf, char **result_buf) /* {{{ */
+static void _php_ibase_event_block(ibase_db_link *ib_link, unsigned short count, /*
{{{ */
+ char **events, unsigned short *l, char **event_buf, char **result_buf)
{
ISC_STATUS dummy_result[20];
unsigned long dummy_count[15];
@@ -142,8 +142,8 @@
}
/* }}} */
-static isc_callback _php_ibase_callback(ibase_event *event,
- unsigned short buffer_size, char *result_buf) /* {{{ */
+static isc_callback _php_ibase_callback(ibase_event *event, /* {{{ */
+ unsigned short buffer_size, char *result_buf)
{
/* this function is called asynchronously by the Interbase client library. */
TSRMLS_FETCH_FROM_CTX(event-thread_ctx);
@@ -305,6 +305,7 @@
ZEND_REGISTER_RESOURCE(return_value, event, le_event);
zend_list_addref(Z_LVAL_P(return_value));
}
+/* }}} */
/* {{{ proto bool ibase_free_event_handler(resource event)
Frees the event handler set by ibase_set_event_handler() */
http://cvs.php.net/diff.php/php-src/ext/interbase/ibase_service.c?r1=1.5r2=1.6ty=u
Index: php-src/ext/interbase/ibase_service.c
diff -u php-src/ext/interbase/ibase_service.c:1.5
php-src/ext/interbase/ibase_service.c:1.6
--- php-src/ext/interbase/ibase_service.c:1.5 Mon Feb 2 09:57:20 2004
+++ php-src/ext/interbase/ibase_service.c Wed Feb 11 06:59:08 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: ibase_service.c,v 1.5 2004/02/02 14:57:20 abies Exp $ */
+/* $Id: ibase_service.c,v 1.6 2004/02/11 11:59:08 abies Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -255,8 +255,8 @@
}
/* }}} */
-static void _php_ibase_service_query(INTERNAL_FUNCTION_PARAMETERS,
- ibase_service *svm, char info_action) /* {{{ */
+static void _php_ibase_service_query(INTERNAL_FUNCTION_PARAMETERS, /* {{{ */
+ ibase_service *svm, char info_action)
{
static char spb[] = { isc_info_svc_timeout, 10, 0, 0, 0 };
@@ -459,6 +459,7 @@
{
_php_ibase_backup_restore(INTERNAL_FUNCTION_PARAM_PASSTHRU,
isc_action_svc_backup);
}
+/* }}} */
/* {{{ proto mixed ibase_restore(resource service_handle, string source_file, string
dest_db [, int options [, bool verbose]])
Initiates a restore task in the service manager and returns immediately */
@@ -595,6 +596,7 @@
_php_ibase_service_query(INTERNAL_FUNCTION_PARAM_PASSTHRU, svm, (char)action);
}
/* }}} */
+
#endif /* HAVE_IBASE6_API */
/*
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/interbase interbase.c
abies Wed Feb 11 07:08:45 2004 EDT
Modified files:
/php-src/ext/interbase interbase.c
Log:
Add version info about run-time client library
# A number of user crashes appear to be caused
# by using incorrect combinations of libraries
http://cvs.php.net/diff.php/php-src/ext/interbase/interbase.c?r1=1.199r2=1.200ty=u
Index: php-src/ext/interbase/interbase.c
diff -u php-src/ext/interbase/interbase.c:1.199 php-src/ext/interbase/interbase.c:1.200
--- php-src/ext/interbase/interbase.c:1.199 Fri Feb 6 10:11:17 2004
+++ php-src/ext/interbase/interbase.c Wed Feb 11 07:08:44 2004
@@ -18,15 +18,19 @@
+--+
*/
-/* $Id: interbase.c,v 1.199 2004/02/06 15:11:17 abies Exp $ */
+/* $Id: interbase.c,v 1.200 2004/02/11 12:08:44 abies Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
#endif
+#ifdef __GNUC__
+#define _GNU_SOURCE
+#endif
+
#include php.h
-#define FILE_REVISION $Revision: 1.199 $
+#define FILE_REVISION $Revision: 1.200 $
#if HAVE_IBASE
@@ -727,21 +731,50 @@
PHP_MINFO_FUNCTION(ibase)
{
- char tmp[64];
+ char tmp[64], *s;
php_info_print_table_start();
php_info_print_table_row(2, Interbase Support, enabled);
-#if (SQLDA_CURRENT_VERSION 1) || defined(FB_SQLDA)
- isc_get_client_version(tmp);
- php_info_print_table_row(2, Client Library, tmp);
+#ifdef FB_API_VER
+ sprintf( (s = tmp), Firebird API version %d, FB_API_VER);
+#elif (SQLDA_CURRENT_VERSION 1)
+ s = Interbase 7.0 and up;
#elif (SQL_DIALECT_CURRENT == 1)
- php_info_print_table_row(2, Client Library, Interbase 5.6 or earlier);
+ s = Interbase 5.6 or earlier;
#elif !defined(DSC_null)
- php_info_print_table_row(2, Client Library, Interbase 6);
+ s = Interbase 6;
+#else
+ s = Firebird 1.0;
+#endif
+ php_info_print_table_row(2, Compile-time Client Library Version, s);
+
+#if defined(__GNUC__) || defined(PHP_WIN32)
+ do {
+#ifdef __GNUC__
+ void (*info_func)(char*) = dlsym(RTLD_DEFAULT,
isc_get_client_version);
+#else
+ void (__stdcall *info_func)(char*) = NULL;
+
+ HMODULE l = GetModuleHandle(fbclient);
+
+ if (!l !(l = GetModuleHandle(gds32))) {
+ break;
+ }
+ info_func = (void (__stdcall *)(char*))GetProcAddress(l,
isc_get_client_version);
+#endif
+ if (info_func) {
+ info_func(s = tmp);
+ } else {
+#if HAVE_IBASE6_API
+ s = Firebird 1.0/Interbase 6;
#else
- php_info_print_table_row(2, Client Library, Firebird 1.0);
+ s = Firebird 1.0/Interbase 6 or earlier;
#endif
+ }
+ php_info_print_table_row(2, Run-time Client Library Version, s);
+ } while (0);
+#endif
php_info_print_table_row(2, Revision, FILE_REVISION);
#ifdef COMPILE_DL_INTERBASE
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c /ext/simplexml/tests 014.phpt 014a.phpt 014b.phpt 016.phpt bug27010.phpt
rrichards Wed Feb 11 07:19:27 2004 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
/php-src/ext/simplexml/tests014.phpt 014a.phpt 014b.phpt 016.phpt
bug27010.phpt
Log:
Fix compiler warnings
Update tests
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.126r2=1.127ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.126 php-src/ext/simplexml/simplexml.c:1.127
--- php-src/ext/simplexml/simplexml.c:1.126 Tue Feb 10 04:30:38 2004
+++ php-src/ext/simplexml/simplexml.c Wed Feb 11 07:19:25 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.126 2004/02/10 09:30:38 zeev Exp $ */
+/* $Id: simplexml.c,v 1.127 2004/02/11 12:19:25 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1077,15 +1077,6 @@
}
/* }}} */
-/* {{{ _free_ns_entry()
- */
-static void
-_free_ns_entry(void *p, xmlChar *data)
-{
- xmlFree(p);
-}
-/* }}} */
-
/* {{{ sxe_object_free_storage()
*/
static void sxe_object_free_storage(void *object TSRMLS_DC)
@@ -1150,7 +1141,7 @@
{
zend_object_value rv;
- rv.handle = zend_objects_store_put(intern, NULL, sxe_object_free_storage,
sxe_object_clone TSRMLS_CC);
+ rv.handle = zend_objects_store_put(intern, NULL,
(zend_objects_free_object_storage_t)sxe_object_free_storage, sxe_object_clone
TSRMLS_CC);
rv.handlers = (zend_object_handlers *) sxe_object_handlers;
return rv;
@@ -1592,7 +1583,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.126 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.127 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/014.phpt?r1=1.4r2=1.5ty=u
Index: php-src/ext/simplexml/tests/014.phpt
diff -u php-src/ext/simplexml/tests/014.phpt:1.4
php-src/ext/simplexml/tests/014.phpt:1.5
--- php-src/ext/simplexml/tests/014.phpt:1.4Sat Jan 17 14:41:32 2004
+++ php-src/ext/simplexml/tests/014.phptWed Feb 11 07:19:26 2004
@@ -53,5 +53,7 @@
[0]=
string(2) 30
}
-
-Fatal error: Unsupported operand types in %s014.php on line %d
+object(simplexml_element)#%d (1) {
+ [0]=
+ string(2) 35
+}
http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/014a.phpt?r1=1.2r2=1.3ty=u
Index: php-src/ext/simplexml/tests/014a.phpt
diff -u php-src/ext/simplexml/tests/014a.phpt:1.2
php-src/ext/simplexml/tests/014a.phpt:1.3
--- php-src/ext/simplexml/tests/014a.phpt:1.2 Sat Jan 17 14:41:32 2004
+++ php-src/ext/simplexml/tests/014a.phpt Wed Feb 11 07:19:26 2004
@@ -48,9 +48,9 @@
NULL
bool(false)
---Unsupported---
+NULL
object(simplexml_element)#%d (1) {
[0]=
- string(2) 30
+ string(1) 5
}
-
-Fatal error: Unsupported operand types in %s014.php on line %d
+===DONE===
\ No newline at end of file
http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/014b.phpt?r1=1.2r2=1.3ty=u
Index: php-src/ext/simplexml/tests/014b.phpt
diff -u php-src/ext/simplexml/tests/014b.phpt:1.2
php-src/ext/simplexml/tests/014b.phpt:1.3
--- php-src/ext/simplexml/tests/014b.phpt:1.2 Sat Jan 17 14:41:32 2004
+++ php-src/ext/simplexml/tests/014b.phpt Wed Feb 11 07:19:26 2004
@@ -50,7 +50,6 @@
---Unsupported---
object(simplexml_element)#%d (1) {
[0]=
- string(2) 30
+ string(1) 5
}
-
-Fatal error: Unsupported operand types in %s014.php on line %d
+===DONE===
\ No newline at end of file
http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/016.phpt?r1=1.5r2=1.6ty=u
Index: php-src/ext/simplexml/tests/016.phpt
diff -u php-src/ext/simplexml/tests/016.phpt:1.5
php-src/ext/simplexml/tests/016.phpt:1.6
--- php-src/ext/simplexml/tests/016.phpt:1.5Thu Jan 22 16:47:54 2004
+++ php-src/ext/simplexml/tests/016.phptWed Feb 11 07:19:26 2004
@@ -54,4 +54,4 @@
[0]=
string(9) JoeFooBar
}
-===Done===
+===DONE===
http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/bug27010.phpt?r1=1.1r2=1.2ty=u
Index: php-src/ext/simplexml/tests/bug27010.phpt
diff -u php-src/ext/simplexml/tests/bug27010.phpt:1.1
php-src/ext/simplexml/tests/bug27010.phpt:1.2
--- php-src/ext/simplexml/tests/bug27010.phpt:1.1 Thu Jan 22 16:55:09 2004
+++ php-src/ext/simplexml/tests/bug27010.phpt Wed Feb 11 07:19:26 2004
@@ -1,31 +1,32 @@
---TEST--
-#27010: segfault and node text not displayed when returned from children()
---FILE--
-?php
-
-$xml=EOF
-drinks xmlns:hot=http://www.example.com/hot;
- hot:drinkhot:nameCoffee/hot:name/hot:drink
- hot:drinkhot:nameTea/hot:name/hot:drink
- drinknameCola/name/drink
- drinknameJuice/name/drink
-/drinks
-EOF;
-
-$sxe = simplexml_load_string($xml);
-
-foreach ($sxe as $element_name = $element) {
-print $element_name is
[PHP-CVS] cvs: php-src /ext/simplexml/tests 014.phpt
rrichards Wed Feb 11 08:00:20 2004 EDT Modified files: /php-src/ext/simplexml/tests014.phpt Log: Fix test http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/014.phpt?r1=1.5r2=1.6ty=u Index: php-src/ext/simplexml/tests/014.phpt diff -u php-src/ext/simplexml/tests/014.phpt:1.5 php-src/ext/simplexml/tests/014.phpt:1.6 --- php-src/ext/simplexml/tests/014.phpt:1.5Wed Feb 11 07:19:26 2004 +++ php-src/ext/simplexml/tests/014.phptWed Feb 11 08:00:19 2004 @@ -57,3 +57,4 @@ [0]= string(2) 35 } +===DONE=== -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap php_encoding.c php_sdl.c php_soap.h soap.c /ext/soap/interop client_round2_interop.php /ext/soap/tests server018.phpt /ext/soap/tests/schema test_schema.inc
dmitry Wed Feb 11 08:53:51 2004 EDT
Added files:
/php-src/ext/soap/tests server018.phpt
Modified files:
/php-src/ext/soap php_encoding.c php_sdl.c php_soap.h soap.c
/php-src/ext/soap/interop client_round2_interop.php
/php-src/ext/soap/tests/schema test_schema.inc
Log:
Now SoapClient uses excptions as default method for error reporting
http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.52r2=1.53ty=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.52 php-src/ext/soap/php_encoding.c:1.53
--- php-src/ext/soap/php_encoding.c:1.52Tue Feb 10 08:41:21 2004
+++ php-src/ext/soap/php_encoding.c Wed Feb 11 08:53:48 2004
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_encoding.c,v 1.52 2004/02/10 13:41:21 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.53 2004/02/11 13:53:48 dmitry Exp $ */
#include time.h
@@ -2363,26 +2363,33 @@
encodePtr get_conversion_ex(HashTable *encoding, int encode)
{
- encodePtr *enc;
+ encodePtr *enc = NULL;
TSRMLS_FETCH();
if (zend_hash_index_find(encoding, encode, (void **)enc) == FAILURE) {
- php_error(E_ERROR, SOAP-ERROR: Encoding: Cannot find encoding);
- }
+ if (SOAP_GLOBAL(overrides)) {
+ smart_str nscat = {0};
- if (SOAP_GLOBAL(overrides)) {
- smart_str nscat = {0};
-
- smart_str_appendl(nscat, (*enc)-details.ns,
strlen((*enc)-details.ns));
- smart_str_appendc(nscat, ':');
- smart_str_appendl(nscat, (*enc)-details.type_str,
strlen((*enc)-details.type_str));
- smart_str_0(nscat);
-
- zend_hash_find(SOAP_GLOBAL(overrides), nscat.c, nscat.len + 1, (void
**)enc);
- smart_str_free(nscat);
+ smart_str_appendl(nscat, (*enc)-details.ns,
strlen((*enc)-details.ns));
+ smart_str_appendc(nscat, ':');
+ smart_str_appendl(nscat, (*enc)-details.type_str,
strlen((*enc)-details.type_str));
+ smart_str_0(nscat);
+
+ if (zend_hash_find(SOAP_GLOBAL(overrides), nscat.c, nscat.len
+ 1, (void **)enc) == FAILURE) {
+ smart_str_free(nscat);
+ php_error(E_ERROR, SOAP-ERROR: Encoding: Cannot find
encoding);
+ return NULL;
+ } else {
+ smart_str_free(nscat);
+ return *enc;
+ }
+ } else {
+ php_error(E_ERROR, SOAP-ERROR: Encoding: Cannot find
encoding);
+ return NULL;
+ }
+ } else {
+ return *enc;
}
-
- return *enc;
}
encodePtr get_conversion_from_href_type_ex(HashTable *encoding, const char *type, int
len)
http://cvs.php.net/diff.php/php-src/ext/soap/php_sdl.c?r1=1.54r2=1.55ty=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.54 php-src/ext/soap/php_sdl.c:1.55
--- php-src/ext/soap/php_sdl.c:1.54 Tue Feb 10 08:41:21 2004
+++ php-src/ext/soap/php_sdl.c Wed Feb 11 08:53:48 2004
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.54 2004/02/10 13:41:21 dmitry Exp $ */
+/* $Id: php_sdl.c,v 1.55 2004/02/11 13:53:48 dmitry Exp $ */
#include php_soap.h
#include libxml/uri.h
@@ -1814,59 +1814,60 @@
sdlPtr get_sdl(char *uri TSRMLS_DC)
{
+ sdlPtr sdl = NULL;
+ char* old_error_code = SOAP_GLOBAL(error_code);
#ifdef SDL_CACHE
- sdlPtr tmp, *hndl;
- TSRMLS_FETCH();
+ sdlPtr *hndl;
- tmp = NULL;
- hndl = NULL;
+ SOAP_GLOBAL(error_code) = WSDL;
if (zend_hash_find(SOAP_GLOBAL(sdls), uri, strlen(uri), (void **)hndl) ==
FAILURE) {
- tmp = load_wsdl(uri);
- zend_hash_add(SOAP_GLOBAL(sdls), uri, strlen(uri), tmp,
sizeof(sdlPtr), NULL);
+ sdl = load_wsdl(uri);
+ zend_hash_add(SOAP_GLOBAL(sdls), uri, strlen(uri), sdl,
sizeof(sdlPtr), NULL);
} else {
- tmp = *hndl;
+ sdl = *hndl;
}
-
- return tmp;
#else
+ SOAP_GLOBAL(error_code) = WSDL;
if (SOAP_GLOBAL(cache_enabled)) {
char fn[MAXPATHLEN];
- char* key;
- sdlPtr sdl;
- time_t t = time(0);
-
- char md5str[33];
- PHP_MD5_CTX context;
- unsigned char digest[16];
- int len = strlen(SOAP_GLOBAL(cache_dir));
if (strchr(uri,':') != NULL ||
[PHP-CVS] cvs: php-src /sapi/cgi cgi_main.c
iliaa Wed Feb 11 09:52:13 2004 EDT
Modified files:
/php-src/sapi/cgi cgi_main.c
Log:
Proper win32 fix.
http://cvs.php.net/diff.php/php-src/sapi/cgi/cgi_main.c?r1=1.247r2=1.248ty=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.247 php-src/sapi/cgi/cgi_main.c:1.248
--- php-src/sapi/cgi/cgi_main.c:1.247 Tue Feb 10 12:44:30 2004
+++ php-src/sapi/cgi/cgi_main.c Wed Feb 11 09:52:12 2004
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.247 2004/02/10 17:44:30 iliaa Exp $ */
+/* $Id: cgi_main.c,v 1.248 2004/02/11 14:52:12 iliaa Exp $ */
#include php.h
#include php_globals.h
@@ -274,7 +274,7 @@
if (!FCGX_IsCGI()) {
FCGX_Request *request = (FCGX_Request *)server_context;
if (
-#ifdef PHP_WIN32
+#ifndef PHP_WIN32
!parent
#endif
(!request || FCGX_FFlush(request-out) == -1)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /sapi/cgi cgi_main.c
iliaa Wed Feb 11 09:52:36 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/sapi/cgi cgi_main.c
Log:
MFH: Win32 build fix.
http://cvs.php.net/diff.php/php-src/sapi/cgi/cgi_main.c?r1=1.190.2.56r2=1.190.2.57ty=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.190.2.56 php-src/sapi/cgi/cgi_main.c:1.190.2.57
--- php-src/sapi/cgi/cgi_main.c:1.190.2.56 Tue Feb 10 12:44:44 2004
+++ php-src/sapi/cgi/cgi_main.c Wed Feb 11 09:52:34 2004
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.190.2.56 2004/02/10 17:44:44 iliaa Exp $ */
+/* $Id: cgi_main.c,v 1.190.2.57 2004/02/11 14:52:34 iliaa Exp $ */
#include php.h
#include php_globals.h
@@ -278,7 +278,7 @@
if (!FCGX_IsCGI()) {
FCGX_Request *request = (FCGX_Request *)server_context;
if (
-#ifdef PHP_WIN32
+#ifndef PHP_WIN32
!parent
#endif
(!request || FCGX_FFlush(request-out) == -1)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/func 002.phpt 003.phpt 004.phpt
zeevWed Feb 11 11:09:47 2004 EDT
Modified files:
/php-src/tests/func 002.phpt 003.phpt 004.phpt
Log:
Get rid of some yucky past, and reenable these tests
http://cvs.php.net/diff.php/php-src/tests/func/002.phpt?r1=1.2r2=1.3ty=u
Index: php-src/tests/func/002.phpt
diff -u php-src/tests/func/002.phpt:1.2 php-src/tests/func/002.phpt:1.3
--- php-src/tests/func/002.phpt:1.2 Sat Nov 23 17:08:03 2002
+++ php-src/tests/func/002.phpt Wed Feb 11 11:09:46 2004
@@ -1,14 +1,13 @@
--TEST--
Static variables in functions
---SKIPIF--
-?php if(version_compare(zend_version(), 2.0.0-dev, '=')) echo skip removed in
Zend Engine 2\n; ?
--FILE--
?php
-old_function blah (
+function blah()
+{
static $hey=0,$yo=0;
echo hey=.$hey++., ,$yo--.\n;
-);
+}
blah();
blah();
http://cvs.php.net/diff.php/php-src/tests/func/003.phpt?r1=1.2r2=1.3ty=u
Index: php-src/tests/func/003.phpt
diff -u php-src/tests/func/003.phpt:1.2 php-src/tests/func/003.phpt:1.3
--- php-src/tests/func/003.phpt:1.2 Sat Nov 23 17:08:03 2002
+++ php-src/tests/func/003.phpt Wed Feb 11 11:09:46 2004
@@ -1,13 +1,12 @@
--TEST--
General function test
---SKIPIF--
-?php if(version_compare(zend_version(), 2.0.0-dev, '=')) echo skip removed in
Zend Engine 2\n; ?
--FILE--
?php
-old_function a (
+function a()
+{
echo hey\n;
-);
+}
function b($i)
{
@@ -34,13 +33,14 @@
a();
-old_function factorial $n (
+function factorial($n)
+{
if ($n==0 || $n==1) {
return 1;
} else {
return factorial($n-1)*$n;
}
-);
+}
function factorial2($start, $n)
@@ -63,17 +63,18 @@
echo and now, from a function...\n;
-old_function call_fact (
+function call_fact()
+{
echo (it should break at 5...)\n;
for ($i=0; $i=10; $i++) {
if ($i == 5) break;
$n=factorial($i);
echo factorial($i) = $n\n;
}
-);
+}
-old_function return4 ( return 4; );
-old_function return7 ( return 7; );
+function return4() { return 4; }
+function return7() { return 7; }
for ($k=0; $k10; $k++) {
call_fact();
@@ -86,12 +87,13 @@
$result=factorial2(return4(),return7());
echo $result\n;
-old_function andi $i, $j (
+function andi($i, $j)
+{
for ($k=$i ; $k=$j ; $k++) {
if ($k 5) continue;
echo $k\n;
}
-);
+}
andi (3,10);
--EXPECT--
http://cvs.php.net/diff.php/php-src/tests/func/004.phpt?r1=1.2r2=1.3ty=u
Index: php-src/tests/func/004.phpt
diff -u php-src/tests/func/004.phpt:1.2 php-src/tests/func/004.phpt:1.3
--- php-src/tests/func/004.phpt:1.2 Sat Nov 23 17:08:03 2002
+++ php-src/tests/func/004.phpt Wed Feb 11 11:09:46 2004
@@ -1,23 +1,23 @@
--TEST--
General function test
---SKIPIF--
-?php if(version_compare(zend_version(), 2.0.0-dev, '=')) echo skip removed in
Zend Engine 2\n; ?
--FILE--
?php
echo Before function declaration...\n;
-old_function print_something_multiple_times $something,$times (
+function print_something_multiple_times($something,$times)
+{
echo \nIn function, printing the string \$something\ $times times\n;
for ($i=0; $i$times; $i++) {
echo $i) $something\n;
}
echo Done with function...\n-\n;
-);
+}
-old_function some_other_function (
+function some_other_function()
+{
echo This is some other function, to ensure more than just one function works
fine...\n;
-);
+}
echo After function declaration...\n;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap php_sdl.c
dmitry Wed Feb 11 11:12:33 2004 EDT
Modified files:
/php-src/ext/soap php_sdl.c
Log:
Cache files access rights were changed.
http://cvs.php.net/diff.php/php-src/ext/soap/php_sdl.c?r1=1.55r2=1.56ty=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.55 php-src/ext/soap/php_sdl.c:1.56
--- php-src/ext/soap/php_sdl.c:1.55 Wed Feb 11 08:53:48 2004
+++ php-src/ext/soap/php_sdl.c Wed Feb 11 11:12:31 2004
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.55 2004/02/11 13:53:48 dmitry Exp $ */
+/* $Id: php_sdl.c,v 1.56 2004/02/11 16:12:31 dmitry Exp $ */
#include php_soap.h
#include libxml/uri.h
@@ -1580,7 +1580,11 @@
HashTable tmp_bindings;
HashTable tmp_functions;
+#ifdef ZEND_WIN32
f = open(fn,O_CREAT|O_WRONLY|O_EXCL|O_BINARY,S_IREAD|S_IWRITE);
+#else
+ f =
open(fn,O_CREAT|O_WRONLY|O_EXCL|O_BINARY,S_IREAD|S_IWRITE|S_IROTH|S_IWOTH|S_IRGRP|S_IWGRP);
+#endif
if (f 0) {return;}
zend_hash_init(tmp_types, 0, NULL, NULL, 0);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap/interop client_round2_interop.php client_round2_params.php client_round2_run.php config.php.dist
dmitry Wed Feb 11 11:13:16 2004 EDT
Modified files:
/php-src/ext/soap/interop client_round2_interop.php
client_round2_params.php
client_round2_run.php config.php.dist
Log:
support for command line interface was improved
http://cvs.php.net/diff.php/php-src/ext/soap/interop/client_round2_interop.php?r1=1.12r2=1.13ty=u
Index: php-src/ext/soap/interop/client_round2_interop.php
diff -u php-src/ext/soap/interop/client_round2_interop.php:1.12
php-src/ext/soap/interop/client_round2_interop.php:1.13
--- php-src/ext/soap/interop/client_round2_interop.php:1.12 Wed Feb 11 08:53:49
2004
+++ php-src/ext/soap/interop/client_round2_interop.php Wed Feb 11 11:13:15 2004
@@ -16,7 +16,7 @@
// | Authors: Shane Caraveo [EMAIL PROTECTED] |
// +--+
//
-// $Id: client_round2_interop.php,v 1.12 2004/02/11 13:53:49 dmitry Exp $
+// $Id: client_round2_interop.php,v 1.13 2004/02/11 16:13:15 dmitry Exp $
//
require_once 'DB.php'; // PEAR/DB
require_once 'client_round2_params.php';
@@ -30,6 +30,8 @@
// database DNS
var $DSN = ;
+var $baseURL = ;
+
// our central interop server, where we can get the list of endpoints
var $interopServer = http://www.whitemesa.net/wsdl/interopInfo.wsdl;;
@@ -57,10 +59,13 @@
var $tests = array('base','GroupB', 'GroupC');
var $paramTypes = array('php', 'soapval');
var $endpoints = array();
+var $html = 1;
function Interop_Client() {
global $interopConfig;
$this-DSN = $interopConfig['DSN'];
+ $this-baseURL = $interopConfig['baseURL'];
+ //$this-baseURL =
'http://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF']);
// set up the database connection
$this-dbc = DB::connect($this-DSN, true);
// if it errors out, just ignore it and rely on regular methods
@@ -71,19 +76,18 @@
// set up local endpoint
$this-localEndpoint['base'] = (object)array(
'endpointName'='PHP ext/soap',
-
'endpointURL'='http://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF']).'/server_round2_base.php',
-
'wsdlURL'='http://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF']).'/interop.wsdl.php'
+
'endpointURL'=$this-baseURL.'/server_round2_base.php',
+'wsdlURL'=$this-baseURL.'/interop.wsdl.php'
);
$this-localEndpoint['GroupB'] = (object)array(
'endpointName'='PHP ext/soap',
-
'endpointURL'='http://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF']).'/server_round2_groupB.php',
-
'wsdlURL'='http://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF']).'/interopB.wsdl.php'
+
'endpointURL'=$this-baseURL.'/server_round2_groupB.php',
+'wsdlURL'=$this-baseURL.'/interopB.wsdl.php'
);
$this-localEndpoint['GroupC'] = (object)array(
'endpointName'='PHP ext/soap',
-
'endpointURL'='http://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF']).'/server_round2_groupC.php',
-
'wsdlURL'='http://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF']).'/echoheadersvc.wsdl.php'
- );
+
'endpointURL'=$this-baseURL.'/server_round2_groupC.php',
+'wsdlURL'=$this-baseURL.'/echoheadersvc.wsdl.php');
}
function _fetchEndpoints($soapclient, $test) {
@@ -92,9 +96,11 @@
// retreive endpoints from the endpoint server
$endpointArray =
$soapclient-__call(GetEndpointInfo,array(groupName=$test),array('soapaction'=http://soapinterop.org/;,'uri'=http://soapinterop.org/;));
if (is_soap_fault($endpointArray) || PEAR::isError($endpointArray)) {
-print pre.$soapclient-wire.\n;
+ if ($this-html) print pre;
+print $soapclient-wire.\n;
print_r($endpointArray);
-print /pre;
+ if ($this-html) print /pre;
+print \n;
return;
}
@@ -145,7 +151,11 @@
$test = 'base';
}
} catch (SoapFault $fault) {
- echo pre$fault/pre;
+if ($this-html) {
+ echo pre$fault/pre\n;
+ } else {
+ echo $fault\n;
+ }
return NULL;
}
// retreive all endpoints now
@@ -552,7 +562,10 @@
[PHP-CVS] cvs: php-src /ext/interbase config.m4
abies Wed Feb 11 11:20:48 2004 EDT Modified files: /php-src/ext/interbase config.m4 Log: Look in the right place for lib http://cvs.php.net/diff.php/php-src/ext/interbase/config.m4?r1=1.17r2=1.18ty=u Index: php-src/ext/interbase/config.m4 diff -u php-src/ext/interbase/config.m4:1.17 php-src/ext/interbase/config.m4:1.18 --- php-src/ext/interbase/config.m4:1.17Sun Feb 1 12:42:26 2004 +++ php-src/ext/interbase/config.m4 Wed Feb 11 11:20:48 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.17 2004/02/01 17:42:26 abies Exp $ +dnl $Id: config.m4,v 1.18 2004/02/11 16:20:48 abies Exp $ dnl PHP_ARG_WITH(interbase,for InterBase support, @@ -45,7 +45,9 @@ AC_MSG_RESULT([Interbase version 6 API has been enabled.]) ], [ AC_MSG_RESULT([Interbase version 6 API has NOT been enabled.]) -], [ ]) +], [ + -L$IBASE_LIBDIR +]) fi PHP_ADD_LIBRARY_WITH_PATH($IBASE_LIBNAME, $IBASE_LIBDIR, INTERBASE_SHARED_LIBADD) -- 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) / configure.in /main php_version.h
iliaa Wed Feb 11 11:49:25 2004 EDT Modified files: (Branch: PHP_4_3) /php-src/main php_version.h /php-srcconfigure.in Log: Back to dev tree (forgot to restore versions). http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.66.2.41r2=1.66.2.42ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.66.2.41 php-src/main/php_version.h:1.66.2.42 --- php-src/main/php_version.h:1.66.2.41Tue Feb 3 09:47:29 2004 +++ php-src/main/php_version.h Wed Feb 11 11:49:23 2004 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 4 #define PHP_MINOR_VERSION 3 #define PHP_RELEASE_VERSION 5 -#define PHP_EXTRA_VERSION RC2 -#define PHP_VERSION 4.3.5RC2 +#define PHP_EXTRA_VERSION RC3-dev +#define PHP_VERSION 4.3.5RC3-dev http://cvs.php.net/diff.php/php-src/configure.in?r1=1.396.2.94r2=1.396.2.95ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.396.2.94 php-src/configure.in:1.396.2.95 --- php-src/configure.in:1.396.2.94 Tue Feb 3 09:47:29 2004 +++ php-src/configure.inWed Feb 11 11:49:24 2004 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.94 2004/02/03 14:47:29 iliaa Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.95 2004/02/11 16:49:24 iliaa Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -41,7 +41,7 @@ MAJOR_VERSION=4 MINOR_VERSION=3 RELEASE_VERSION=5 -EXTRA_VERSION=RC2 +EXTRA_VERSION=RC3-dev VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION dnl Define where extension directories are located in the configure context -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /sapi/apache2handler sapi_apache2.c
iliaa Wed Feb 11 11:53:03 2004 EDT Modified files: (Branch: PHP_4_3) /php-src/sapi/apache2handlersapi_apache2.c Log: MFH: fixed a compilation error. http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.1.2.27r2=1.1.2.28ty=u Index: php-src/sapi/apache2handler/sapi_apache2.c diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.27 php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.28 --- php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.27 Mon Feb 9 18:28:47 2004 +++ php-src/sapi/apache2handler/sapi_apache2.c Wed Feb 11 11:53:03 2004 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: sapi_apache2.c,v 1.1.2.27 2004/02/09 23:28:47 iliaa Exp $ */ +/* $Id: sapi_apache2.c,v 1.1.2.28 2004/02/11 16:53:03 iliaa Exp $ */ #include fcntl.h @@ -429,7 +429,7 @@ ap_set_content_type(r, apr_pstrdup(r-pool, content_type)); efree(content_type); - content_length = (char *) apr_table_get(f-r-headers_in, Content-Length); + content_length = (char *) apr_table_get(r-headers_in, Content-Length); SG(request_info).content_length = (content_length ? atoi(content_length) : 0); apr_table_unset(r-headers_out, Content-Length); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/session/tests bug26862.phpt /ext/standard url_scanner_ex.c url_scanner_ex.re
iliaa Wed Feb 11 12:00:49 2004 EDT
Added files:
/php-src/ext/session/tests bug26862.phpt
Modified files:
/php-src/ext/standard url_scanner_ex.c url_scanner_ex.re
Log:
Fixed bug #26862 (ob_flush() followed by output_reset_rewrite_vars() may
result in data loss).
http://cvs.php.net/diff.php/php-src/ext/standard/url_scanner_ex.c?r1=1.82r2=1.83ty=u
Index: php-src/ext/standard/url_scanner_ex.c
diff -u php-src/ext/standard/url_scanner_ex.c:1.82
php-src/ext/standard/url_scanner_ex.c:1.83
--- php-src/ext/standard/url_scanner_ex.c:1.82 Thu Jan 8 14:17:50 2004
+++ php-src/ext/standard/url_scanner_ex.c Wed Feb 11 12:00:47 2004
@@ -1,5 +1,5 @@
-/* Generated by re2c 0.5 on Thu Jan 8 20:25:46 2004 */
-#line 1 /usr/src/web/php/php5/ext/standard/url_scanner_ex.re
+/* Generated by re2c 0.5 on Wed Feb 11 11:58:10 2004 */
+#line 1 /home/rei/php5/ext/standard/url_scanner_ex.re
/*
+--+
| PHP Version 5|
@@ -918,7 +918,7 @@
size_t len;
if (BG(url_adapt_state_ex).url_app.len != 0) {
-*handled_output = url_adapt_ext(output, output_len, len, (zend_bool)
(modePHP_OUTPUT_HANDLER_END ? 1 : 0) TSRMLS_CC);
+*handled_output = url_adapt_ext(output, output_len, len, (zend_bool) (mode
(PHP_OUTPUT_HANDLER_END|PHP_OUTPUT_HANDLER_CONT) ? 1 : 0) TSRMLS_CC);
if (sizeof(uint) sizeof(size_t)) {
if (len UINT_MAX)
len = UINT_MAX;
http://cvs.php.net/diff.php/php-src/ext/standard/url_scanner_ex.re?r1=1.70r2=1.71ty=u
Index: php-src/ext/standard/url_scanner_ex.re
diff -u php-src/ext/standard/url_scanner_ex.re:1.70
php-src/ext/standard/url_scanner_ex.re:1.71
--- php-src/ext/standard/url_scanner_ex.re:1.70 Thu Jan 8 12:32:52 2004
+++ php-src/ext/standard/url_scanner_ex.re Wed Feb 11 12:00:47 2004
@@ -417,7 +417,7 @@
size_t len;
if (BG(url_adapt_state_ex).url_app.len != 0) {
-*handled_output = url_adapt_ext(output, output_len, len, (zend_bool)
(modePHP_OUTPUT_HANDLER_END ? 1 : 0) TSRMLS_CC);
+*handled_output = url_adapt_ext(output, output_len, len, (zend_bool) (mode
(PHP_OUTPUT_HANDLER_END|PHP_OUTPUT_HANDLER_CONT) ? 1 : 0) TSRMLS_CC);
if (sizeof(uint) sizeof(size_t)) {
if (len UINT_MAX)
len = UINT_MAX;
http://cvs.php.net/co.php/php-src/ext/session/tests/bug26862.phpt?r=1.1p=1
Index: php-src/ext/session/tests/bug26862.phpt
+++ php-src/ext/session/tests/bug26862.phpt
--TEST--
Bug #26862 (ob_flush() before output_reset_rewrite_vars() results in data loss)
--SKIPIF--
?php include('skipif.inc'); ?
--INI--
register_globals=0
html_errors=0
--FILE--
?php
session_start();
output_add_rewrite_var('var', 'value');
echo 'a href=file.phplink/a';
ob_flush();
output_reset_rewrite_vars();
echo 'a href=file.phplink/a';
?
--EXPECT--
a href=file.php?var=valuelink/aa href=file.phplink/a
--
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/session/tests bug26862.phpt /ext/standard url_scanner_ex.c url_scanner_ex.re
iliaa Wed Feb 11 12:00:58 2004 EDT
Added files: (Branch: PHP_4_3)
/php-src/ext/session/tests bug26862.phpt
Modified files:
/php-src/ext/standard url_scanner_ex.c url_scanner_ex.re
/php-srcNEWS
Log:
MFH: Fixed bug #26862 (ob_flush() followed by output_reset_rewrite_vars()
may result in data loss).
http://cvs.php.net/diff.php/php-src/ext/standard/url_scanner_ex.c?r1=1.72.2.8r2=1.72.2.9ty=u
Index: php-src/ext/standard/url_scanner_ex.c
diff -u php-src/ext/standard/url_scanner_ex.c:1.72.2.8
php-src/ext/standard/url_scanner_ex.c:1.72.2.9
--- php-src/ext/standard/url_scanner_ex.c:1.72.2.8 Tue May 20 12:53:58 2003
+++ php-src/ext/standard/url_scanner_ex.c Wed Feb 11 12:00:54 2004
@@ -1,5 +1,5 @@
-/* Generated by re2c 0.5 on Thu Apr 17 02:53:49 2003 */
-#line 1 /usr/src/web/php/php4/ext/standard/url_scanner_ex.re
+/* Generated by re2c 0.5 on Wed Feb 11 11:33:22 2004 */
+#line 1 /home/rei/php4/ext/standard/url_scanner_ex.re
/*
+--+
| PHP Version 4|
@@ -918,7 +918,7 @@
size_t len;
if (BG(url_adapt_state_ex).url_app.len != 0) {
-*handled_output = url_adapt_ext(output, output_len, len, (zend_bool)
(modePHP_OUTPUT_HANDLER_END ? 1 : 0) TSRMLS_CC);
+*handled_output = url_adapt_ext(output, output_len, len, (zend_bool) (mode
(PHP_OUTPUT_HANDLER_END|PHP_OUTPUT_HANDLER_CONT) ? 1 : 0) TSRMLS_CC);
if (sizeof(uint) sizeof(size_t)) {
if (len UINT_MAX)
len = UINT_MAX;
http://cvs.php.net/diff.php/php-src/ext/standard/url_scanner_ex.re?r1=1.63.2.5r2=1.63.2.6ty=u
Index: php-src/ext/standard/url_scanner_ex.re
diff -u php-src/ext/standard/url_scanner_ex.re:1.63.2.5
php-src/ext/standard/url_scanner_ex.re:1.63.2.6
--- php-src/ext/standard/url_scanner_ex.re:1.63.2.5 Wed Apr 16 18:57:15 2003
+++ php-src/ext/standard/url_scanner_ex.re Wed Feb 11 12:00:54 2004
@@ -417,7 +417,7 @@
size_t len;
if (BG(url_adapt_state_ex).url_app.len != 0) {
-*handled_output = url_adapt_ext(output, output_len, len, (zend_bool)
(modePHP_OUTPUT_HANDLER_END ? 1 : 0) TSRMLS_CC);
+*handled_output = url_adapt_ext(output, output_len, len, (zend_bool) (mode
(PHP_OUTPUT_HANDLER_END|PHP_OUTPUT_HANDLER_CONT) ? 1 : 0) TSRMLS_CC);
if (sizeof(uint) sizeof(size_t)) {
if (len UINT_MAX)
len = UINT_MAX;
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.559r2=1.1247.2.560ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.559 php-src/NEWS:1.1247.2.560
--- php-src/NEWS:1.1247.2.559 Tue Feb 10 11:09:55 2004
+++ php-src/NEWSWed Feb 11 12:00:54 2004
@@ -11,6 +11,8 @@
- Fixed bug #27135 (Possible crash inside mb_strlen()). (Moriyoshi)
- Fixed bug #27026 (Added cgi.nph php.ini option to allow forcing of
the 'Status: 200' header that is not normally needed). (Ilia)
+- Fixed bug #26862 (ob_flush() followed by output_reset_rewrite_vars() may
+ result in data loss). (Ilia, scottmacvicar at ntlworld dot com)
- Fixed bug #26758 (FastCGI exits immediately with status 255). (Ilia,
tcarter at noggin dot com dot au)
- Fixed bug #26653 (open_basedir incorrectly resolved on win32). (Ilia,
http://cvs.php.net/co.php/php-src/ext/session/tests/bug26862.phpt?r=1.1p=1
Index: php-src/ext/session/tests/bug26862.phpt
+++ php-src/ext/session/tests/bug26862.phpt
--TEST--
Bug #26862 (ob_flush() before output_reset_rewrite_vars() results in data loss)
--SKIPIF--
?php include('skipif.inc'); ?
--INI--
register_globals=0
html_errors=0
--FILE--
?php
session_start();
output_add_rewrite_var('var', 'value');
echo 'a href=file.phplink/a';
ob_flush();
output_reset_rewrite_vars();
echo 'a href=file.phplink/a';
?
--EXPECT--
a href=file.php?var=valuelink/aa href=file.phplink/a
--
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/standard/tests/file bug27183.phpt /main user_streams.c
iliaa Wed Feb 11 12:09:10 2004 EDT
Added files: (Branch: PHP_4_3)
/php-src/ext/standard/tests/filebug27183.phpt
Modified files:
/php-srcNEWS
/php-src/main user_streams.c
Log:
Fixed bug #27183 (userland stream wrapper segfaults on stream_write).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.560r2=1.1247.2.561ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.560 php-src/NEWS:1.1247.2.561
--- php-src/NEWS:1.1247.2.560 Wed Feb 11 12:00:54 2004
+++ php-src/NEWSWed Feb 11 12:09:08 2004
@@ -3,6 +3,8 @@
?? Feb 2004, Version 4.3.5
- Fixed bug #27196 (Missing content_length initialization in apache 2 sapis).
(Ilia, pdoru at kappa dot ro)
+- Fixed bug #27183 (userland stream wrapper segfaults on stream_write).
+ (Moriyoshi)
- Fixed bug #27175 (tzset() is not being called by PHP on startup).
(Ilia, sagawa at sohgoh dot net)
- Fixed bug #27172 (Possible floating point exception in gmp_powm()). (Ilia)
http://cvs.php.net/diff.php/php-src/main/user_streams.c?r1=1.29.2.2r2=1.29.2.3ty=u
Index: php-src/main/user_streams.c
diff -u php-src/main/user_streams.c:1.29.2.2 php-src/main/user_streams.c:1.29.2.3
--- php-src/main/user_streams.c:1.29.2.2Thu May 29 16:24:00 2003
+++ php-src/main/user_streams.c Wed Feb 11 12:09:09 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: user_streams.c,v 1.29.2.2 2003/05/29 20:24:00 hholzgra Exp $ */
+/* $Id: user_streams.c,v 1.29.2.3 2004/02/11 17:09:09 iliaa Exp $ */
#include php.h
#include php_globals.h
@@ -382,15 +382,15 @@
int call_result;
php_userstream_data_t *us = (php_userstream_data_t *)stream-abstract;
zval **args[1];
- zval zbuff, *zbufptr;
+ zval *zbufptr;
size_t didwrite = 0;
assert(us != NULL);
ZVAL_STRINGL(func_name, USERSTREAM_WRITE, sizeof(USERSTREAM_WRITE)-1, 0);
- ZVAL_STRINGL(zbuff, (char*)buf, count, 0);
- zbufptr = zbuff;
+ MAKE_STD_ZVAL(zbufptr);
+ ZVAL_STRINGL(zbufptr, (char*)buf, count, 1);
args[0] = zbufptr;
call_result = call_user_function_ex(NULL,
@@ -400,6 +400,8 @@
1, args,
0, NULL TSRMLS_CC);
+ zval_ptr_dtor(zbufptr);
+
didwrite = 0;
if (call_result == SUCCESS retval != NULL) {
convert_to_long(retval);
http://cvs.php.net/co.php/php-src/ext/standard/tests/file/bug27183.phpt?r=1.1p=1
Index: php-src/ext/standard/tests/file/bug27183.phpt
+++ php-src/ext/standard/tests/file/bug27183.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard head.c
bfrance Wed Feb 11 14:00:44 2004 EDT
Modified files:
/php-src/ext/standard head.c
Log:
Added checks for invalid characters in a cookie name or cookie data from
setrawcookie
http://cvs.php.net/diff.php/php-src/ext/standard/head.c?r1=1.74r2=1.75ty=u
Index: php-src/ext/standard/head.c
diff -u php-src/ext/standard/head.c:1.74 php-src/ext/standard/head.c:1.75
--- php-src/ext/standard/head.c:1.74Thu Jan 8 03:17:32 2004
+++ php-src/ext/standard/head.c Wed Feb 11 14:00:42 2004
@@ -15,7 +15,7 @@
| Author: Rasmus Lerdorf [EMAIL PROTECTED]|
+--+
*/
-/* $Id: head.c,v 1.74 2004/01/08 08:17:32 andi Exp $ */
+/* $Id: head.c,v 1.75 2004/02/11 19:00:42 bfrance Exp $ */
#include stdio.h
@@ -74,6 +74,16 @@
sapi_header_line ctr = {0};
int result;
+ if (name strpbrk(name, =,; \t\r\n\013\014) != NULL) { /* man isspace
for \013 and \014 */
+ zend_error( E_WARNING, Cookie names can not contain any of the
folllowing '=,; \\t\\r\\n\\013\\014' (%s), name );
+ return FAILURE;
+ }
+
+ if (!url_encode value strpbrk(value, ,; \t\r\n\013\014) != NULL) { /*
man isspace for \013 and \014 */
+ zend_error( E_WARNING, Cookie values can not contain any of the
folllowing ',; \\t\\r\\n\\013\\014' (%s), value );
+ return FAILURE;
+ }
+
len += name_len;
if (value url_encode) {
int encoded_value_len;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
bfrance Wed Feb 11 14:02:41 2004 EDT Modified files: /php-srcNEWS Log: - Added checks for invalid characters in a cookie name or cookie data from setrawcookie. (Brian) - Added new pspell functions to set the dict-dir and data-dir options. (Brian) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1599r2=1.1600ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1599 php-src/NEWS:1.1600 --- php-src/NEWS:1.1599 Tue Feb 10 04:37:11 2004 +++ php-src/NEWSWed Feb 11 14:02:39 2004 @@ -1,6 +1,9 @@ PHPNEWS ||| ?? ??? 2004, PHP 5 Beta 4 +- Added checks for invalid characters in a cookie name or cookie data + from setrawcookie. (Brian) +- Added new pspell functions to set the dict-dir and data-dir options. (Brian) - Added support for ++ and += (and similar) to SimpleXML. (Andi, Zeev) - Added infrastructure for ++ and += (and similar) to object overloading modules. (Andi, Zeev) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
zeevWed Feb 11 14:15:34 2004 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
Prevent SimpleXML from silently modifying types of variables that are
assigned to its objects.
Implementation notes for overloaded object modules:
- If you return a zval which is not otherwise referenced by the extension
or the engine's symbol table, its reference count should be 0.
- If you receive a value zval in write_property/write_dimension, you
may only modify it if its reference count is 1. Otherwise, you must
create a copy of that zval before making any changes. You should NOT
modify the reference count of the value passed to you.
Have fun!
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.127r2=1.128ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.127 php-src/ext/simplexml/simplexml.c:1.128
--- php-src/ext/simplexml/simplexml.c:1.127 Wed Feb 11 07:19:25 2004
+++ php-src/ext/simplexml/simplexml.c Wed Feb 11 14:15:30 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.127 2004/02/11 12:19:25 rrichards Exp $ */
+/* $Id: simplexml.c,v 1.128 2004/02/11 19:15:30 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -274,14 +274,25 @@
static void
change_node_zval(xmlNodePtr node, zval *value)
{
+ zval value_copy;
+
switch (Z_TYPE_P(value)) {
case IS_LONG:
case IS_BOOL:
case IS_DOUBLE:
case IS_NULL:
+ if (value-refcount 1) {
+ value_copy = *value;
+ zval_copy_ctor(value_copy);
+ value = value_copy;
+ }
convert_to_string(value);
+ /* break missing intentionally */
case IS_STRING:
xmlNodeSetContentLen(node, Z_STRVAL_P(value),
Z_STRLEN_P(value));
+ if (value == value_copy) {
+ zval_dtor(value);
+ }
break;
default:
php_error(E_WARNING, It is not possible to assign complex
types to nodes);
@@ -1583,7 +1594,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.127 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.128 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
Hello Zeev, Wednesday, February 11, 2004, 8:15:34 PM, you wrote: zeev Wed Feb 11 14:15:34 2004 EDT Modified files: /php-src/ext/simplexmlsimplexml.c Log: Prevent SimpleXML from silently modifying types of variables that are assigned to its objects. Implementation notes for overloaded object modules: - If you return a zval which is not otherwise referenced by the extension or the engine's symbol table, its reference count should be 0. - If you receive a value zval in write_property/write_dimension, you may only modify it if its reference count is 1. Otherwise, you must create a copy of that zval before making any changes. You should NOT modify the reference count of the value passed to you. Shouldn't that comment make it into a .h file near the place where the handler type is define? (aka documentation where it belong) regards marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/cgi cgi_main.c /sapi/cli php_cli.c
helly Wed Feb 11 16:00:47 2004 EDT
Modified files:
/php-src/sapi/cgi cgi_main.c
/php-src/sapi/cli php_cli.c
Log:
Bugfix #27104 CLI/CGI SAPI module variable name conflict
http://cvs.php.net/diff.php/php-src/sapi/cgi/cgi_main.c?r1=1.248r2=1.249ty=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.248 php-src/sapi/cgi/cgi_main.c:1.249
--- php-src/sapi/cgi/cgi_main.c:1.248 Wed Feb 11 09:52:12 2004
+++ php-src/sapi/cgi/cgi_main.c Wed Feb 11 16:00:44 2004
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.248 2004/02/11 14:52:12 iliaa Exp $ */
+/* $Id: cgi_main.c,v 1.249 2004/02/11 21:00:44 helly Exp $ */
#include php.h
#include php_globals.h
@@ -119,8 +119,8 @@
#define PHP_MODE_LINT 4
#define PHP_MODE_STRIP 5
-static char *optarg = NULL;
-static int optind = 1;
+static char *php_optarg = NULL;
+static int php_optind = 1;
static const opt_struct OPTIONS[] = {
{'a', 0, interactive},
@@ -928,8 +928,8 @@
/* temporary locals */
int behavior=PHP_MODE_STANDARD;
int no_headers=0;
- int orig_optind=optind;
- char *orig_optarg=optarg;
+ int orig_optind=php_optind;
+ char *orig_optarg=php_optarg;
char *script_file=NULL;
zend_llist global_vars;
#if FORCE_CGI_REDIRECT
@@ -1018,10 +1018,10 @@
/* allow ini override for fastcgi */
#endif
) {
- while ((c=php_getopt(argc, argv, OPTIONS, optarg, optind, 0))!=-1) {
+ while ((c=php_getopt(argc, argv, OPTIONS, php_optarg, php_optind,
0))!=-1) {
switch (c) {
case 'c':
- cgi_sapi_module.php_ini_path_override =
strdup(optarg);
+ cgi_sapi_module.php_ini_path_override =
strdup(php_optarg);
break;
case 'n':
cgi_sapi_module.php_ini_ignore = 1;
@@ -1033,7 +1033,7 @@
server by accepting a bindpath parameter. */
case 'b':
if (!fastcgi) {
- bindpath = strdup(optarg);
+ bindpath = strdup(php_optarg);
}
break;
#endif
@@ -1041,8 +1041,8 @@
}
}
- optind = orig_optind;
- optarg = orig_optarg;
+ php_optind = orig_optind;
+ php_optarg = orig_optarg;
}
#ifdef ZTS
@@ -1254,7 +1254,7 @@
!fastcgi
#endif
) {
- while ((c=php_getopt(argc, argv, OPTIONS, optarg, optind,
1))!=-1) {
+ while ((c=php_getopt(argc, argv, OPTIONS, php_optarg,
php_optind, 1))!=-1) {
switch (c) {
case 'h':
case '?':
@@ -1268,8 +1268,8 @@
break;
}
}
- optind = orig_optind;
- optarg = orig_optarg;
+ php_optind = orig_optind;
+ php_optarg = orig_optarg;
}
#if PHP_FASTCGI
@@ -1319,7 +1319,7 @@
exit(1);
}
- while ((c = php_getopt(argc, argv, OPTIONS, optarg, optind,
0)) != -1) {
+ while ((c = php_getopt(argc, argv, OPTIONS, php_optarg,
php_optind, 0)) != -1) {
switch (c) {
case 'a': /* interactive mode */
@@ -1331,7 +1331,7 @@
SG(options) |= SAPI_OPTION_NO_CHDIR;
break;
case 'd': /* define ini entries on command line */
- define_command_line_ini_entry(optarg);
+
define_command_line_ini_entry(php_optarg);
break;
case 'e': /* enable extended info output */
@@ -1339,16 +1339,16 @@
break;
case 'f': /* parse file */
- script_file = estrdup(optarg);
+ script_file = estrdup(php_optarg);
no_headers = 1;
[PHP-CVS] cvs: php-src / NEWS
sniper Wed Feb 11 16:17:40 2004 EDT Modified files: /php-srcNEWS Log: style http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1600r2=1.1601ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1600 php-src/NEWS:1.1601 --- php-src/NEWS:1.1600 Wed Feb 11 14:02:39 2004 +++ php-src/NEWSWed Feb 11 16:17:35 2004 @@ -1,9 +1,11 @@ PHPNEWS ||| ?? ??? 2004, PHP 5 Beta 4 -- Added checks for invalid characters in a cookie name or cookie data - from setrawcookie. (Brian) -- Added new pspell functions to set the dict-dir and data-dir options. (Brian) +- Added checks for invalid characters in a cookie name and cookie data + into set[raw]cookie(). (Brian) +- Added new pspell functions: (Brian) + . pspell_config_dict_dir() + . pspell_config_data_dir() - Added support for ++ and += (and similar) to SimpleXML. (Andi, Zeev) - Added infrastructure for ++ and += (and similar) to object overloading modules. (Andi, Zeev) @@ -13,15 +15,12 @@ - Added error message when trying to re-assign to $this variable. (Zeev, Andi) - Improved destructor implementation to always call destructors on clean shutdown. An order of destruction is not guaranteed. (Zeev, Andi) -- Fixed problem with parse error in include() file not stopping PHP's - execution. (Ilia) - Redesigned exception support. This fixes many bugs in the previous design such as nested try's and problems with overloaded extensions. (Zeev, Andi) - Redesigned clone by adding a clone keyword (clone $obj) and copying all properties before __clone() is called. Also allows calling parent __clone function by using parent::__clone(). (Zeev, Andi) - Added support for an interface to extend another interface (Zeev) -- Respect property visibility in foreach. (Marcus) - Completely overhauled SimpleXML extension. (Marcus, Rob, Sterling) - Added new Interbase functions: (Ard) . ibase_service_attach() and ibase_service_detach(). @@ -34,6 +33,9 @@ - Added xsltprocessor-registerPHPFunctions(). (Christian) - Bundled new SPL extension. (Marcus, Derick) - Upgraded SQLite library to version 2.8.11. (Ilia, Wez) +- Fixed foreach() to respect property visibility. (Marcus) +- Fixed problem with parse error in include() file not stopping PHP's + execution. (Ilia) - Fixed var_export() to show public, protected and private modifiers properly. (Derick) - Fixed problems with longlong values in mysqli. (Georg) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pspell pspell.c
sniper Wed Feb 11 16:20:23 2004 EDT
Modified files:
/php-src/ext/pspell pspell.c
Log:
There is CODING_STANDARDS..at least NEW code should respect those..
http://cvs.php.net/diff.php/php-src/ext/pspell/pspell.c?r1=1.41r2=1.42ty=u
Index: php-src/ext/pspell/pspell.c
diff -u php-src/ext/pspell/pspell.c:1.41 php-src/ext/pspell/pspell.c:1.42
--- php-src/ext/pspell/pspell.c:1.41Wed Feb 11 13:50:16 2004
+++ php-src/ext/pspell/pspell.c Wed Feb 11 16:20:22 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: pspell.c,v 1.41 2004/02/11 18:50:16 bfrance Exp $ */
+/* $Id: pspell.c,v 1.42 2004/02/11 21:20:22 sniper Exp $ */
#define IS_EXT_MODULE
@@ -805,21 +805,21 @@
}
/* }}} */
-static int pspell_config_path( INTERNAL_FUNCTION_PARAMETERS, char *option ) {
+static int pspell_config_path(INTERNAL_FUNCTION_PARAMETERS, char *option)
+{
int type;
zval **sccin, **value;
int argc;
-
PspellConfig *config;
argc = ZEND_NUM_ARGS();
- if (argc != 2 || zend_get_parameters_ex(argc,sccin,value) == FAILURE) {
+ if (argc != 2 || zend_get_parameters_ex(argc, sccin, value) == FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_long_ex(sccin);
config = (PspellConfig *) zend_list_find(Z_LVAL_PP(sccin), type);
- if(!config){
+ if (!config) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, %ld is not a PSPELL
config index, Z_LVAL_PP(sccin));
RETURN_FALSE;
}
@@ -843,25 +843,23 @@
Use a personal dictionary for this config */
PHP_FUNCTION(pspell_config_personal)
{
- pspell_config_path( INTERNAL_FUNCTION_PARAM_PASSTHRU, personal);
+ pspell_config_path(INTERNAL_FUNCTION_PARAM_PASSTHRU, personal);
}
/* }}} */
/* {{{ proto bool pspell_config_dict_dir(int conf, string directory)
-
location of the main word list */
PHP_FUNCTION(pspell_config_dict_dir)
{
- pspell_config_path( INTERNAL_FUNCTION_PARAM_PASSTHRU, dict-dir);
+ pspell_config_path(INTERNAL_FUNCTION_PARAM_PASSTHRU, dict-dir);
}
-
/* }}} */
/* {{{ proto bool pspell_config_data_dir(int conf, string directory)
location of language data files */
PHP_FUNCTION(pspell_config_data_dir)
{
- pspell_config_path( INTERNAL_FUNCTION_PARAM_PASSTHRU, data-dir);
+ pspell_config_path(INTERNAL_FUNCTION_PARAM_PASSTHRU, data-dir);
}
/* }}} */
--
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 /sapi/cgi cgi_main.c /sapi/cli php_cli.c
helly Wed Feb 11 17:00:39 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/sapi/cgi cgi_main.c
/php-src/sapi/cli php_cli.c
/php-srcNEWS
Log:
MFH: Bug #27104 CLI/CGI SAPI module variable name conflict
http://cvs.php.net/diff.php/php-src/sapi/cgi/cgi_main.c?r1=1.190.2.57r2=1.190.2.58ty=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.190.2.57 php-src/sapi/cgi/cgi_main.c:1.190.2.58
--- php-src/sapi/cgi/cgi_main.c:1.190.2.57 Wed Feb 11 09:52:34 2004
+++ php-src/sapi/cgi/cgi_main.c Wed Feb 11 17:00:34 2004
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.190.2.57 2004/02/11 14:52:34 iliaa Exp $ */
+/* $Id: cgi_main.c,v 1.190.2.58 2004/02/11 22:00:34 helly Exp $ */
#include php.h
#include php_globals.h
@@ -119,8 +119,8 @@
#define PHP_MODE_LINT 4
#define PHP_MODE_STRIP 5
-static char *optarg = NULL;
-static int optind = 1;
+static char *php_optarg = NULL;
+static int php_optind = 1;
static const opt_struct OPTIONS[] = {
{'a', 0, interactive},
@@ -960,8 +960,8 @@
/* temporary locals */
int behavior=PHP_MODE_STANDARD;
int no_headers=0;
- int orig_optind=optind;
- char *orig_optarg=optarg;
+ int orig_optind=php_optind;
+ char *orig_optarg=php_optarg;
char *script_file=NULL;
zend_llist global_vars;
int interactive=0;
@@ -1039,10 +1039,10 @@
/* allow ini override for fastcgi */
#endif
) {
- while ((c=php_getopt(argc, argv, OPTIONS, optarg, optind, 0))!=-1) {
+ while ((c=php_getopt(argc, argv, OPTIONS, php_optarg, php_optind,
0))!=-1) {
switch (c) {
case 'c':
- cgi_sapi_module.php_ini_path_override =
strdup(optarg);
+ cgi_sapi_module.php_ini_path_override =
strdup(php_optarg);
break;
case 'n':
cgi_sapi_module.php_ini_ignore = 1;
@@ -1054,7 +1054,7 @@
server by accepting a bindpath parameter. */
case 'b':
if (!fastcgi) {
- bindpath = strdup(optarg);
+ bindpath = strdup(php_optarg);
}
break;
#endif
@@ -1062,8 +1062,8 @@
}
}
- optind = orig_optind;
- optarg = orig_optarg;
+ php_optind = orig_optind;
+ php_optarg = orig_optarg;
}
#ifdef ZTS
@@ -1269,7 +1269,7 @@
!fastcgi
#endif
) {
- while ((c=php_getopt(argc, argv, OPTIONS, optarg, optind,
1))!=-1) {
+ while ((c=php_getopt(argc, argv, OPTIONS, php_optarg,
php_optind, 1))!=-1) {
switch (c) {
case 'h':
case '?':
@@ -1283,8 +1283,8 @@
break;
}
}
- optind = orig_optind;
- optarg = orig_optarg;
+ php_optind = orig_optind;
+ php_optarg = orig_optarg;
}
#if PHP_FASTCGI
@@ -1334,7 +1334,7 @@
exit(1);
}
- while ((c = php_getopt(argc, argv, OPTIONS, optarg, optind,
0)) != -1) {
+ while ((c = php_getopt(argc, argv, OPTIONS, php_optarg,
php_optind, 0)) != -1) {
switch (c) {
case 'a': /* interactive mode */
@@ -1346,7 +1346,7 @@
SG(options) |= SAPI_OPTION_NO_CHDIR;
break;
case 'd': /* define ini entries on command line */
- define_command_line_ini_entry(optarg);
+
define_command_line_ini_entry(php_optarg);
break;
case 'e': /* enable extended info output */
@@ -1354,16 +1354,16 @@
break;
case 'f': /* parse file */
- script_file =
[PHP-CVS] cvs: CVSROOT / avail
derick Wed Feb 11 17:34:43 2004 EDT Modified files: /CVSROOTavail Log: - Move ADT to PECL http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.826r2=1.827ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.826 CVSROOT/avail:1.827 --- CVSROOT/avail:1.826 Thu Feb 5 04:55:20 2004 +++ CVSROOT/avail Wed Feb 11 17:34:42 2004 @@ -103,7 +103,7 @@ # Finally, there are various people with access to various bits and # pieces of other CVS modules. -avail|sterling,derick,imajes,phanto,sebastian,helly|adt +avail|sterling,derick,imajes,phanto,sebastian,helly,jan|pecl/adt avail|wez,sterling,edink,derick,tal,bs|embed,embed-web avail|hholzgra,stas|functable avail|alan_k|php-gtk/ext/gtkhtml,php-gtk/ext/scintilla -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl spl_sxe.c
helly Wed Feb 11 18:36:26 2004 EDT
Modified files:
/php-src/ext/splspl_sxe.c
Log:
Cleanup
http://cvs.php.net/diff.php/php-src/ext/spl/spl_sxe.c?r1=1.5r2=1.6ty=u
Index: php-src/ext/spl/spl_sxe.c
diff -u php-src/ext/spl/spl_sxe.c:1.5 php-src/ext/spl/spl_sxe.c:1.6
--- php-src/ext/spl/spl_sxe.c:1.5 Tue Jan 20 15:59:45 2004
+++ php-src/ext/spl/spl_sxe.c Wed Feb 11 18:36:25 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_sxe.c,v 1.5 2004/01/20 20:59:45 helly Exp $ */
+/* $Id: spl_sxe.c,v 1.6 2004/02/11 23:36:25 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -144,13 +144,11 @@
};
/* }}} */
-#define SimpleXML_Element sxe_get_element_class_entry()
-
SPL_API PHP_MINIT_FUNCTION(spl_sxe) /* {{{ */
{
zend_class_entry *spl_ce_SimpleXML_Element = sxe_get_element_class_entry();
- if (!sxe_get_element_class_entry()) {
+ if (!spl_ce_SimpleXML_Element) {
return SUCCESS; /* SimpleXML must be initialized before */
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard datetime.c
sniper Wed Feb 11 20:28:13 2004 EDT
Modified files:
/php-src/ext/standard datetime.c
Log:
- Fixed bug #23467 (Showing incorrect Time Zone)
# patch by scottmacvicar at ntlworld dot com
http://cvs.php.net/diff.php/php-src/ext/standard/datetime.c?r1=1.113r2=1.114ty=u
Index: php-src/ext/standard/datetime.c
diff -u php-src/ext/standard/datetime.c:1.113 php-src/ext/standard/datetime.c:1.114
--- php-src/ext/standard/datetime.c:1.113 Thu Jan 8 03:17:30 2004
+++ php-src/ext/standard/datetime.c Wed Feb 11 20:28:12 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: datetime.c,v 1.113 2004/01/08 08:17:30 andi Exp $ */
+/* $Id: datetime.c,v 1.114 2004/02/12 01:28:12 sniper Exp $ */
#include php.h
#include zend_operators.h
@@ -319,6 +319,10 @@
} else {
tname[0] = ???;
}
+
+ if (tzname[1] != NULL) {
+ tname[1] = tzname[1];
+ }
#endif
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard datetime.c
sniper Wed Feb 11 20:29:14 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard datetime.c
Log:
MFH: - Fixed bug #23467 (Showing incorrect Time Zone)
# patch by scottmacvicar at ntlworld dot com
http://cvs.php.net/diff.php/php-src/ext/standard/datetime.c?r1=1.96.2.9r2=1.96.2.10ty=u
Index: php-src/ext/standard/datetime.c
diff -u php-src/ext/standard/datetime.c:1.96.2.9
php-src/ext/standard/datetime.c:1.96.2.10
--- php-src/ext/standard/datetime.c:1.96.2.9Sun Sep 14 20:08:05 2003
+++ php-src/ext/standard/datetime.c Wed Feb 11 20:29:13 2004
@@ -19,7 +19,7 @@
*/
-/* $Id: datetime.c,v 1.96.2.9 2003/09/15 00:08:05 iliaa Exp $ */
+/* $Id: datetime.c,v 1.96.2.10 2004/02/12 01:29:13 sniper Exp $ */
#include php.h
@@ -323,7 +323,11 @@
tname[0] = tzname[0];
} else {
tname[0] = ???;
- }
+ }
+
+ if (tzname[1] != NULL) {
+ tname[1] = tzname[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/standard datetime.c
sniper Wed Feb 11 20:31:59 2004 EDT
Modified files:
/php-src/ext/standard datetime.c
Log:
ws fix
http://cvs.php.net/diff.php/php-src/ext/standard/datetime.c?r1=1.114r2=1.115ty=u
Index: php-src/ext/standard/datetime.c
diff -u php-src/ext/standard/datetime.c:1.114 php-src/ext/standard/datetime.c:1.115
--- php-src/ext/standard/datetime.c:1.114 Wed Feb 11 20:28:12 2004
+++ php-src/ext/standard/datetime.c Wed Feb 11 20:31:57 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: datetime.c,v 1.114 2004/02/12 01:28:12 sniper Exp $ */
+/* $Id: datetime.c,v 1.115 2004/02/12 01:31:57 sniper Exp $ */
#include php.h
#include zend_operators.h
@@ -319,10 +319,10 @@
} else {
tname[0] = ???;
}
-
- if (tzname[1] != NULL) {
- tname[1] = tzname[1];
- }
+
+ if (tzname[1] != NULL) {
+ tname[1] = tzname[1];
+ }
#endif
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard datetime.c
sniper Wed Feb 11 20:32:40 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard datetime.c
Log:
MFH: ws fix
http://cvs.php.net/diff.php/php-src/ext/standard/datetime.c?r1=1.96.2.10r2=1.96.2.11ty=u
Index: php-src/ext/standard/datetime.c
diff -u php-src/ext/standard/datetime.c:1.96.2.10
php-src/ext/standard/datetime.c:1.96.2.11
--- php-src/ext/standard/datetime.c:1.96.2.10 Wed Feb 11 20:29:13 2004
+++ php-src/ext/standard/datetime.c Wed Feb 11 20:32:40 2004
@@ -19,7 +19,7 @@
*/
-/* $Id: datetime.c,v 1.96.2.10 2004/02/12 01:29:13 sniper Exp $ */
+/* $Id: datetime.c,v 1.96.2.11 2004/02/12 01:32:40 sniper Exp $ */
#include php.h
@@ -323,11 +323,11 @@
tname[0] = tzname[0];
} else {
tname[0] = ???;
- }
+ }
- if (tzname[1] != NULL) {
- tname[1] = tzname[1];
- }
+ if (tzname[1] != NULL) {
+ tname[1] = tzname[1];
+ }
#endif
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/pspell php_pspell.h pspell.c
Hi, On 11 Feb 2004, at 19:50, Brian France wrote: bfrance Wed Feb 11 13:50:17 2004 EDT Modified files: /php-src/ext/pspell php_pspell.h pspell.c Log: Added two new functions to set the dict-dir and data-dir options. We're in fix-only mode. New features should be discussed with Andi first. These changes seem harmless, though. Jan -- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/pspell php_pspell.h pspell.c
Hi, On 11 Feb 2004, at 19:50, Brian France wrote: bfrance Wed Feb 11 13:50:17 2004 EDT Modified files: /php-src/ext/pspell php_pspell.h pspell.c Log: Added two new functions to set the dict-dir and data-dir options. We're in fix-only mode. New features should be discussed with Andi first. These changes seem harmless, though. Jan -- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/pspell php_pspell.h pspell.c
Ok, let me know if you want me to back them out. I worked with Vlad on the changes and had him review the patch before committing it. We (Yahoo) have been running them for a couple of weeks now with out any problems. Brian On Feb 11, 2004, at 3:12 PM, Jan Lehnardt wrote: Hi, On 11 Feb 2004, at 19:50, Brian France wrote: bfrance Wed Feb 11 13:50:17 2004 EDT Modified files: /php-src/ext/pspell php_pspell.h pspell.c Log: Added two new functions to set the dict-dir and data-dir options. We're in fix-only mode. New features should be discussed with Andi first. These changes seem harmless, though. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
