[PHP-CVS] cvs: php-src / NEWS
zeevTue Feb 10 04:37:17 2004 EDT Modified files: /php-srcNEWS Log: Update NEWS http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1598r2=1.1599ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1598 php-src/NEWS:1.1599 --- php-src/NEWS:1.1598 Thu Feb 5 16:11:26 2004 +++ php-src/NEWSTue Feb 10 04:37:11 2004 @@ -1,6 +1,9 @@ PHPNEWS ||| ?? ??? 2004, PHP 5 Beta 4 +- Added support for ++ and += (and similar) to SimpleXML. (Andi, Zeev) +- Added infrastructure for ++ and += (and similar) to object overloading + modules. (Andi, Zeev) - Readded support for using classes before they are declared according to the behavior in PHP 4. This won't work with classes who are using PHP 5 features such as interfaces. (Zeev, Andi) @@ -8,7 +11,7 @@ - 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) + 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 @@ -42,11 +45,11 @@ (Ilia, runekl[at]opoint[dot]com - Fixed bug #26947 (ext/dom: Crash when using DomDocument::getElementById()). (Christian) -- Fixed bug #26911 (crash in sqlite extension when fetching data from empty +- Fixed bug #26911 (crash in sqlite extension when fetching data from empty queries). (Ilia) - Fixed bug #26844 (ext/mime_magic: magic file validation broken). (Jani) - Fixed bug #26819 (http_build_query() crashes on NULL output). (Ilia) -- Fixed bug #26817 (http_build_query() does not handle private protected +- Fixed bug #26817 (http_build_query() does not handle private protected object properties correctly). (Ilia) - Fixed bug #26815 (foreach of (DOM) childnodes crashes when Xinclude is used). (Rob) @@ -68,12 +71,12 @@ - Fixed bug #26675 (Segfault on ArrayAccess use). (Marcus) - Fixed bug #26640 (__autoload() not invoked by Reflection classes). (Jani) - Fixed bug #26543 (call_user_func() broken for self, parent). (Stanislav) -- Fixed bug #26077 (memory leak when new() result is not assigned and no +- Fixed bug #26077 (memory leak when new() result is not assigned and no constructor is defined). (Stanislav) - Fixed bug #26065 (Crash when nesting classes). (Marcus) - Fixed bug #25816 (disallow arrays in class constants). (Stanislav) - Fixed bug #25329 (sqlite_create_function with method and reference to $this). - (Marcus) + (Marcus) - Fixed bug #25038 (call_user_func() issues a warning if function throws an exception). (Marcus) - Fixed bug #24608 (__set not triggered when overloading with array). @@ -121,19 +124,19 @@ - Fixed get_declared_classes() to return only classes. (Andrey, Marcus) - Fixed __autoload() to preserve case of the passed class name. (Andi) - Fixed bug #26615 () (runekl at opoint dot com, Derick) -- Fixed bug #26591 (__autoload threw an exception during an uncaught). +- Fixed bug #26591 (__autoload threw an exception during an uncaught). (Marcus) - Fixed bug #26534 (stream_get_meta_data() - Access Violation). (Wez) -- Fixed bug #26528 (HTML entities are not being decoded by +- Fixed bug #26528 (HTML entities are not being decoded by xml_parse()/xml_parse_into_struct()). (Ilia) - Fixed bug #26182 (Object properties created redundantly). (Andi) - Fixed bug #26156 (REPLACE_ZVAL_VALUE works on uninit stack-based zvals). (Moriyoshi) - Fixed bug #26083 (Non-working write support in ext/dom). (Ilia) - Fixed bug #26072 (--disable-libxml does not work). (Jani) -- Fixed bug #26001 (serialize crashes when accessing an overloaded object that +- Fixed bug #26001 (serialize crashes when accessing an overloaded object that has no properties (NULL hashtable)). (Wez) -- Fixed bug #25664 (COM crashes when calling a Delphi implementations of +- Fixed bug #25664 (COM crashes when calling a Delphi implementations of ITypeInfo). (Wez) - Fixed bug #24837 (Incorrect behaviour of PPP using foreach). (Marcus) - Fixed bug #24693 (Allow session.use_trans_sid to be enabled/disabled from @@ -159,10 +162,10 @@ statements into ibase_query() . Added ability to bind PHP arrays to native Interbase arrays . Added ibase_commit_ret() and ibase_rollback_ret() - . Added ibase_drop_db() + . Added ibase_drop_db() . Added ibase_gen_id() . Added ibase_name_result() - . Added ibase_errcode() + . Added ibase_errcode() . Added ibase_affected_rows() and ibase_num_params() . Added ibase_param_info() . Added ibase_wait_event() @@ -191,7 +194,7 @@ - Fixed IPv6 support in MacOSX Panther. (Dan, Marko) - Fixed fgetcsv()
[PHP-CVS] cvs: php-src /tests/lang bug26866.phpt
sniper Tue Feb 10 07:58:37 2004 EDT
Added files:
/php-src/tests/lang bug26866.phpt
Log:
Add test case for bug #26866
http://cvs.php.net/co.php/php-src/tests/lang/bug26866.phpt?r=1.1p=1
Index: php-src/tests/lang/bug26866.phpt
+++ php-src/tests/lang/bug26866.phpt
--TEST--
Bug #26866 (segfault when exception raised in __get)
--FILE--
?php
class bar {
function get_name() {
return 'bar';
}
}
class foo {
function __get($sName) {
throw new Exception('Exception!');
return new bar();
}
}
$foo = new foo();
try {
echo $foo-bar-get_name();
}
catch (Exception $E) {
echo Exception raised!\n;
}
?
--EXPECT--
Exception raised!
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap TODO php_encoding.c php_packet_soap.c php_schema.c php_schema.h php_sdl.c php_sdl.h php_soap.h soap.c
dmitry Tue Feb 10 08:41:22 2004 EDT
Modified files:
/php-src/ext/soap TODO php_encoding.c php_packet_soap.c
php_schema.c php_schema.h php_sdl.c php_sdl.h
php_soap.h soap.c
Log:
WSDL caching was implemented
http://cvs.php.net/diff.php/php-src/ext/soap/TODO?r1=1.40r2=1.41ty=u
Index: php-src/ext/soap/TODO
diff -u php-src/ext/soap/TODO:1.40 php-src/ext/soap/TODO:1.41
--- php-src/ext/soap/TODO:1.40 Thu Feb 5 15:26:02 2004
+++ php-src/ext/soap/TODO Tue Feb 10 08:41:21 2004
@@ -3,7 +3,7 @@
- make sure soapserver.map(), soap_encode_to_xml() and soap_encode_to_zval() are
really need
- reimplement SoapObject::__getfunctions() and SoapObject::__gettypes()
to return structures instead of strings
-- memory leaks (libxml and WSDL/Schema use malloc to cache WSDL)
+? memory leaks (libxml and WSDL/Schema use malloc to cache WSDL)
- error handling???
SOAP
@@ -57,7 +57,7 @@
- support for opperation fault
? server part support for document style encoding
- function/method overloading/redeclaration (test(int); test(string))
-- wsdl caching
++ wsdl caching
- wsdl auto generation
? SOAP binding
- soap:body parts attribute
http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.51r2=1.52ty=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.51 php-src/ext/soap/php_encoding.c:1.52
--- php-src/ext/soap/php_encoding.c:1.51Fri Feb 6 09:22:33 2004
+++ php-src/ext/soap/php_encoding.c Tue Feb 10 08:41:21 2004
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_encoding.c,v 1.51 2004/02/06 14:22:33 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.52 2004/02/10 13:41:21 dmitry Exp $ */
#include time.h
@@ -826,7 +826,7 @@
}
}
case XSD_CONTENT_GROUP:
- model_to_zval_object(ret, model-u.group, data, sdl TSRMLS_CC);
+ model_to_zval_object(ret, model-u.group-model, data, sdl
TSRMLS_CC);
default:
break;
}
@@ -1023,7 +1023,7 @@
return 0;
}
case XSD_CONTENT_GROUP: {
- return model_to_xml_object(node, model-u.group, prop, style,
model-min_occurs 0);
+ return model_to_xml_object(node, model-u.group-model, prop,
style, model-min_occurs 0);
}
default:
break;
@@ -1555,7 +1555,7 @@
int dimension = 1;
int* dims = NULL;
int* pos = NULL;
- xmlAttrPtr attr;
+ xmlAttrPtr attr;
sdlPtr sdl;
sdlAttributePtr *arrayType;
sdlExtraAttributePtr *ext;
http://cvs.php.net/diff.php/php-src/ext/soap/php_packet_soap.c?r1=1.32r2=1.33ty=u
Index: php-src/ext/soap/php_packet_soap.c
diff -u php-src/ext/soap/php_packet_soap.c:1.32 php-src/ext/soap/php_packet_soap.c:1.33
--- php-src/ext/soap/php_packet_soap.c:1.32 Thu Feb 5 04:28:09 2004
+++ php-src/ext/soap/php_packet_soap.c Tue Feb 10 08:41:21 2004
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_packet_soap.c,v 1.32 2004/02/05 09:28:09 dmitry Exp $ */
+/* $Id: php_packet_soap.c,v 1.33 2004/02/10 13:41:21 dmitry Exp $ */
#include php_soap.h
@@ -240,63 +240,66 @@
char *name, *ns = NULL;
zval* tmp;
sdlSoapBindingFunctionPtr fnb =
(sdlSoapBindingFunctionPtr)fn-bindingAttributes;
- int res_count = zend_hash_num_elements(fn-responseParameters);
+ int res_count;
hdrs = fnb-output.headers;
- zend_hash_internal_pointer_reset(fn-responseParameters);
- while (zend_hash_get_current_data(fn-responseParameters,
(void **)h_param) == SUCCESS) {
- param = (*h_param);
- if (fnb-style == SOAP_DOCUMENT) {
- name = param-encode-details.type_str;
- ns = param-encode-details.ns;
- } else {
- name = fn-responseName;
- /* ns = ? */
- }
-
- /* Get value of parameter */
- cur = get_node_ex(resp, name, ns);
- if (!cur) {
- cur = get_node(resp, name);
- /* TODO: produce warning invalid ns */
- }
-
[PHP-CVS] cvs: php-src /ext/tokenizer tokenizer.c
jan Tue Feb 10 09:40:40 2004 EDT Modified files: /php-src/ext/tokenizer tokenizer.c Log: - fix #27197 for Greg ([EMAIL PROTECTED]) http://cvs.php.net/diff.php/php-src/ext/tokenizer/tokenizer.c?r1=1.25r2=1.26ty=u Index: php-src/ext/tokenizer/tokenizer.c diff -u php-src/ext/tokenizer/tokenizer.c:1.25 php-src/ext/tokenizer/tokenizer.c:1.26 --- php-src/ext/tokenizer/tokenizer.c:1.25 Sat Jan 17 12:44:27 2004 +++ php-src/ext/tokenizer/tokenizer.c Tue Feb 10 09:40:39 2004 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: tokenizer.c,v 1.25 2004/01/17 17:44:27 andrey Exp $ */ +/* $Id: tokenizer.c,v 1.26 2004/02/10 14:40:39 jan Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -345,6 +345,7 @@ case T_OPEN_TAG_WITH_ECHO: case T_WHITESPACE: case T_COMMENT: + case T_DOC_COMMENT: case T_CLOSE_TAG: destroy = 0; break; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/lang bug22231.phpt bug22510.phpt
andiTue Feb 10 10:20:51 2004 EDT
Modified files:
/php-src/tests/lang bug22231.phpt bug22510.phpt
Log:
Fix a couple of tests
http://cvs.php.net/diff.php/php-src/tests/lang/bug22231.phpt?r1=1.3r2=1.4ty=u
Index: php-src/tests/lang/bug22231.phpt
diff -u php-src/tests/lang/bug22231.phpt:1.3 php-src/tests/lang/bug22231.phpt:1.4
--- php-src/tests/lang/bug22231.phpt:1.3Sun Nov 30 08:57:19 2003
+++ php-src/tests/lang/bug22231.phptTue Feb 10 10:20:51 2004
@@ -25,6 +25,7 @@
var_dump($foo-fubar);
?
--EXPECTF--
+Strict Standards: Assigning the return value of new by reference is deprecated in %s
on line %d
object(foo)#%d (1) {
[fubar]=
string(5) fubar
http://cvs.php.net/diff.php/php-src/tests/lang/bug22510.phpt?r1=1.5r2=1.6ty=u
Index: php-src/tests/lang/bug22510.phpt
diff -u php-src/tests/lang/bug22510.phpt:1.5 php-src/tests/lang/bug22510.phpt:1.6
--- php-src/tests/lang/bug22510.phpt:1.5Wed Dec 17 12:25:00 2003
+++ php-src/tests/lang/bug22510.phptTue Feb 10 10:20:51 2004
@@ -89,6 +89,7 @@
print I'm alive!\n;
?
--EXPECTF--
+Strict Standards: Assigning the return value of new by reference is deprecated in %s
on line %d
ok1
bar::run1
foo::method1
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main fopen_wrappers.c
iliaa Tue Feb 10 11:08:56 2004 EDT
Modified files:
/php-src/main fopen_wrappers.c
Log:
Fixed bug #26653 (open_basedir incorrectly resolved on win32).
http://cvs.php.net/diff.php/php-src/main/fopen_wrappers.c?r1=1.168r2=1.169ty=u
Index: php-src/main/fopen_wrappers.c
diff -u php-src/main/fopen_wrappers.c:1.168 php-src/main/fopen_wrappers.c:1.169
--- php-src/main/fopen_wrappers.c:1.168 Thu Jan 8 03:17:53 2004
+++ php-src/main/fopen_wrappers.c Tue Feb 10 11:08:54 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: fopen_wrappers.c,v 1.168 2004/01/08 08:17:53 andi Exp $ */
+/* $Id: fopen_wrappers.c,v 1.169 2004/02/10 16:08:54 iliaa Exp $ */
/* {{{ includes
*/
@@ -131,15 +131,15 @@
if ((expand_filepath(path, resolved_name TSRMLS_CC) != NULL)
(expand_filepath(local_open_basedir, resolved_basedir TSRMLS_CC) != NULL)) {
/* Handler for basedirs that end with a / */
resolved_basedir_len = strlen(resolved_basedir);
- if (basedir[strlen(basedir)-1] == PHP_DIR_SEPARATOR
resolved_basedir[resolved_basedir_len -1] != PHP_DIR_SEPARATOR) {
- resolved_basedir[resolved_basedir_len] = '/';
+ if (resolved_basedir[resolved_basedir_len -1] != PHP_DIR_SEPARATOR) {
+ resolved_basedir[resolved_basedir_len] = PHP_DIR_SEPARATOR;
resolved_basedir[++resolved_basedir_len] = '\0';
}
if (path[strlen(path)-1] == PHP_DIR_SEPARATOR) {
resolved_name_len = strlen(resolved_name);
if (resolved_name[resolved_name_len - 1] != PHP_DIR_SEPARATOR)
{
- resolved_name[resolved_name_len] = '/';
+ resolved_name[resolved_name_len] = PHP_DIR_SEPARATOR;
resolved_name[++resolved_name_len] = '\0';
}
}
--
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 /main fopen_wrappers.c
iliaa Tue Feb 10 11:09:57 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/main fopen_wrappers.c
Log:
MFH: Fixed bug #26653 (open_basedir incorrectly resolved on win32).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.558r2=1.1247.2.559ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.558 php-src/NEWS:1.1247.2.559
--- php-src/NEWS:1.1247.2.558 Mon Feb 9 21:00:02 2004
+++ php-src/NEWSTue Feb 10 11:09:55 2004
@@ -13,6 +13,8 @@
the 'Status: 200' header that is not normally needed). (Ilia)
- 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,
+ scottmacvicar at ntlworld dot com)
- Fixed bug #24773 (unsetting string as array causes a crash). (Sara)
03 Feb 2004, Version 4.3.5RC2
http://cvs.php.net/diff.php/php-src/main/fopen_wrappers.c?r1=1.153.2.7r2=1.153.2.8ty=u
Index: php-src/main/fopen_wrappers.c
diff -u php-src/main/fopen_wrappers.c:1.153.2.7 php-src/main/fopen_wrappers.c:1.153.2.8
--- php-src/main/fopen_wrappers.c:1.153.2.7 Wed Jul 30 13:55:21 2003
+++ php-src/main/fopen_wrappers.c Tue Feb 10 11:09:56 2004
@@ -16,7 +16,7 @@
| Jim Winstead [EMAIL PROTECTED] |
+--+
*/
-/* $Id: fopen_wrappers.c,v 1.153.2.7 2003/07/30 17:55:21 iliaa Exp $ */
+/* $Id: fopen_wrappers.c,v 1.153.2.8 2004/02/10 16:09:56 iliaa Exp $ */
/* {{{ includes
*/
@@ -132,15 +132,15 @@
if ((expand_filepath(path, resolved_name TSRMLS_CC) != NULL)
(expand_filepath(local_open_basedir, resolved_basedir TSRMLS_CC) != NULL)) {
/* Handler for basedirs that end with a / */
resolved_basedir_len = strlen(resolved_basedir);
- if (basedir[strlen(basedir)-1] == PHP_DIR_SEPARATOR
resolved_basedir[resolved_basedir_len -1] != PHP_DIR_SEPARATOR) {
- resolved_basedir[resolved_basedir_len] = '/';
+ if (resolved_basedir[resolved_basedir_len -1] != PHP_DIR_SEPARATOR) {
+ resolved_basedir[resolved_basedir_len] = PHP_DIR_SEPARATOR;
resolved_basedir[++resolved_basedir_len] = '\0';
}
if (path[strlen(path)-1] == PHP_DIR_SEPARATOR) {
resolved_name_len = strlen(resolved_name);
if (resolved_name[resolved_name_len - 1] != PHP_DIR_SEPARATOR)
{
- resolved_name[resolved_name_len] = '/';
+ resolved_name[resolved_name_len] = PHP_DIR_SEPARATOR;
resolved_name[++resolved_name_len] = '\0';
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main main.c
zeevTue Feb 10 12:44:18 2004 EDT
Modified files:
/php-src/main main.c
Log:
Whitespace
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.588r2=1.589ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.588 php-src/main/main.c:1.589
--- php-src/main/main.c:1.588 Sun Feb 8 23:04:24 2004
+++ php-src/main/main.c Tue Feb 10 12:44:18 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.588 2004/02/09 04:04:24 iliaa Exp $ */
+/* $Id: main.c,v 1.589 2004/02/10 17:44:18 zeev Exp $ */
/* {{{ includes
*/
@@ -923,7 +923,7 @@
case ZMSG_MEMORY_LEAK_DETECTED:
case ZMSG_MEMORY_LEAK_REPEATED:
#if ZEND_DEBUG
- if ((EG(error_reporting)E_WARNING) PG(report_memleaks)) {
+ if ((EG(error_reporting) E_WARNING) PG(report_memleaks)) {
char memory_leak_buf[512];
if (message==ZMSG_MEMORY_LEAK_DETECTED) {
--
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/cgi/libfcgi/include fcgi_config.h
iliaa Tue Feb 10 12:44:31 2004 EDT
Modified files:
/php-src/sapi/cgi cgi_main.c
/php-src/sapi/cgi/libfcgi/include fcgi_config.h
Log:
Fixed win32 build.
Fixed building of libfcgi when PHP is built from another directory.
Added missing headers needed for wait().
Removed duplicate signal.h header.
Removed unneeded variables.
http://cvs.php.net/diff.php/php-src/sapi/cgi/cgi_main.c?r1=1.246r2=1.247ty=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.246 php-src/sapi/cgi/cgi_main.c:1.247
--- php-src/sapi/cgi/cgi_main.c:1.246 Mon Feb 9 19:29:46 2004
+++ php-src/sapi/cgi/cgi_main.c Tue Feb 10 12:44:30 2004
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.246 2004/02/10 00:29:46 iliaa Exp $ */
+/* $Id: cgi_main.c,v 1.247 2004/02/10 17:44:30 iliaa Exp $ */
#include php.h
#include php_globals.h
@@ -48,6 +48,12 @@
#if HAVE_SETLOCALE
#include locale.h
#endif
+#if HAVE_SYS_TYPES_H
+#include sys/types.h
+#endif
+#if HAVE_SYS_WAIT_H
+#include sys/wait.h
+#endif
#include zend.h
#include zend_extensions.h
#include php_ini.h
@@ -61,10 +67,6 @@
#include win32/php_registry.h
#endif
-#if HAVE_SIGNAL_H
-#include signal.h
-#endif
-
#ifdef __riscos__
#include unixlib/local.h
#endif
@@ -271,7 +273,11 @@
#if PHP_FASTCGI
if (!FCGX_IsCGI()) {
FCGX_Request *request = (FCGX_Request *)server_context;
- if (!parent (!request || FCGX_FFlush(request-out) == -1)) {
+ if (
+#ifdef PHP_WIN32
+ !parent
+#endif
+ (!request || FCGX_FFlush(request-out) == -1)) {
php_handle_aborted_connection();
}
return;
@@ -1177,7 +1183,6 @@
if( children ) {
int running = 0;
- int i;
pid_t pid;
/* Create a process group for ourself children */
http://cvs.php.net/diff.php/php-src/sapi/cgi/libfcgi/include/fcgi_config.h?r1=1.2r2=1.3ty=u
Index: php-src/sapi/cgi/libfcgi/include/fcgi_config.h
diff -u php-src/sapi/cgi/libfcgi/include/fcgi_config.h:1.2
php-src/sapi/cgi/libfcgi/include/fcgi_config.h:1.3
--- php-src/sapi/cgi/libfcgi/include/fcgi_config.h:1.2 Tue Nov 26 00:51:16 2002
+++ php-src/sapi/cgi/libfcgi/include/fcgi_config.h Tue Feb 10 12:44:31 2004
@@ -2,6 +2,6 @@
#ifdef _WIN32
#include fcgi_config_win32.h
#else
-#include main/php_config.h
+#include php_config.h
#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) /sapi/cgi cgi_main.c
iliaa Tue Feb 10 12:44:45 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/sapi/cgi cgi_main.c
Log:
MFH:
Fixed win32 build.
Added missing headers needed for wait().
Removed duplicate signal.h header.
http://cvs.php.net/diff.php/php-src/sapi/cgi/cgi_main.c?r1=1.190.2.55r2=1.190.2.56ty=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.190.2.55 php-src/sapi/cgi/cgi_main.c:1.190.2.56
--- php-src/sapi/cgi/cgi_main.c:1.190.2.55 Mon Feb 9 19:30:03 2004
+++ php-src/sapi/cgi/cgi_main.c Tue Feb 10 12:44:44 2004
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.190.2.55 2004/02/10 00:30:03 iliaa Exp $ */
+/* $Id: cgi_main.c,v 1.190.2.56 2004/02/10 17:44:44 iliaa Exp $ */
#include php.h
#include php_globals.h
@@ -48,6 +48,12 @@
#if HAVE_SETLOCALE
#include locale.h
#endif
+#if HAVE_SYS_TYPES_H
+#include sys/types.h
+#endif
+#if HAVE_SYS_WAIT_H
+#include sys/wait.h
+#endif
#include zend.h
#include zend_extensions.h
#include php_ini.h
@@ -61,10 +67,6 @@
#include win32/php_registry.h
#endif
-#if HAVE_SIGNAL_H
-#include signal.h
-#endif
-
#ifdef __riscos__
#include unixlib/local.h
#endif
@@ -275,7 +277,11 @@
#if PHP_FASTCGI
if (!FCGX_IsCGI()) {
FCGX_Request *request = (FCGX_Request *)server_context;
- if (!parent (!request || FCGX_FFlush(request-out) == -1)) {
+ if (
+#ifdef PHP_WIN32
+ !parent
+#endif
+ (!request || FCGX_FFlush(request-out) == -1)) {
php_handle_aborted_connection();
}
return;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main config.w32.h main.c
zeevTue Feb 10 12:55:33 2004 EDT
Modified files:
/php-src/main config.w32.h main.c
Log:
Fix report_memleaks
http://cvs.php.net/diff.php/php-src/main/config.w32.h?r1=1.83r2=1.84ty=u
Index: php-src/main/config.w32.h
diff -u php-src/main/config.w32.h:1.83 php-src/main/config.w32.h:1.84
--- php-src/main/config.w32.h:1.83 Tue Dec 9 18:59:33 2003
+++ php-src/main/config.w32.h Tue Feb 10 12:55:32 2004
@@ -2,7 +2,7 @@
Build Configuration for Win32.
This has only been tested with MS VisualC++ 6 (and later).
- $Id: config.w32.h,v 1.83 2003/12/09 23:59:33 sniper Exp $
+ $Id: config.w32.h,v 1.84 2004/02/10 17:55:32 zeev Exp $
*/
/* Default PHP / PEAR directories */
@@ -189,6 +189,7 @@
#define PHP_SHLIB_SUFFIX dll
#define HAVE_SQLDATASOURCES
#define POSIX_MALLOC_THRESHOLD 10
+//#define HAVE_SOCKLEN_T 1
/* Win32 supports strcoll */
#define HAVE_STRCOLL 1
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.589r2=1.590ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.589 php-src/main/main.c:1.590
--- php-src/main/main.c:1.589 Tue Feb 10 12:44:18 2004
+++ php-src/main/main.c Tue Feb 10 12:55:32 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.589 2004/02/10 17:44:18 zeev Exp $ */
+/* $Id: main.c,v 1.590 2004/02/10 17:55:32 zeev Exp $ */
/* {{{ includes
*/
@@ -952,7 +952,7 @@
break;
case ZMSG_MEMORY_LEAKS_GRAND_TOTAL:
#if ZEND_DEBUG
- if ((EG(error_reporting)E_WARNING) PG(report_memleaks)) {
+ if ((EG(error_reporting) E_WARNING) PG(report_memleaks)) {
char memory_leak_buf[512];
snprintf(memory_leak_buf, 512, === Total %d memory
leaks detected ===\n, *((zend_uint *) data));
@@ -1200,8 +1200,10 @@
*/
void php_request_shutdown(void *dummy)
{
+ zend_bool report_memleaks;
TSRMLS_FETCH();
+ report_memleaks = PG(report_memleaks);
/* EG(opline_ptr) points into nirvana and therefore cannot be safely accessed
* inside zend_executor callback functions.
*/
@@ -1244,8 +1246,8 @@
sapi_deactivate(TSRMLS_C);
} zend_end_try();
- zend_try {
- shutdown_memory_manager(CG(unclean_shutdown), 0 TSRMLS_CC);
+ zend_try {
+ shutdown_memory_manager(CG(unclean_shutdown) || !report_memleaks, 0
TSRMLS_CC);
} zend_end_try();
zend_try {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main main.c
zeevTue Feb 10 13:46:55 2004 EDT
Modified files:
/php-src/main main.c
Log:
Cleanup
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.590r2=1.591ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.590 php-src/main/main.c:1.591
--- php-src/main/main.c:1.590 Tue Feb 10 12:55:32 2004
+++ php-src/main/main.c Tue Feb 10 13:46:53 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.590 2004/02/10 17:55:32 zeev Exp $ */
+/* $Id: main.c,v 1.591 2004/02/10 18:46:53 zeev Exp $ */
/* {{{ includes
*/
@@ -923,7 +923,7 @@
case ZMSG_MEMORY_LEAK_DETECTED:
case ZMSG_MEMORY_LEAK_REPEATED:
#if ZEND_DEBUG
- if ((EG(error_reporting) E_WARNING) PG(report_memleaks)) {
+ if (EG(error_reporting) E_WARNING) {
char memory_leak_buf[512];
if (message==ZMSG_MEMORY_LEAK_DETECTED) {
@@ -952,7 +952,7 @@
break;
case ZMSG_MEMORY_LEAKS_GRAND_TOTAL:
#if ZEND_DEBUG
- if ((EG(error_reporting) E_WARNING) PG(report_memleaks)) {
+ if (EG(error_reporting) E_WARNING) {
char memory_leak_buf[512];
snprintf(memory_leak_buf, 512, === Total %d memory
leaks detected ===\n, *((zend_uint *) data));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sybase_ct/tests test.inc
thekid Tue Feb 10 15:39:09 2004 EDT
Modified files:
/php-src/ext/sybase_ct/teststest.inc
Log:
- Removed pointless call to error_reporting()
http://cvs.php.net/diff.php/php-src/ext/sybase_ct/tests/test.inc?r1=1.3r2=1.4ty=u
Index: php-src/ext/sybase_ct/tests/test.inc
diff -u php-src/ext/sybase_ct/tests/test.inc:1.3
php-src/ext/sybase_ct/tests/test.inc:1.4
--- php-src/ext/sybase_ct/tests/test.inc:1.3Sun Feb 8 19:14:24 2004
+++ php-src/ext/sybase_ct/tests/test.incTue Feb 10 15:39:08 2004
@@ -1,11 +1,9 @@
?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: test.inc,v 1.3 2004/02/09 00:14:24 thekid Exp $
+ * $Id: test.inc,v 1.4 2004/02/10 20:39:08 thekid Exp $
*/
- error_reporting(E_ALL);
-
// Change if needed
define('HOST', '');
define('USER', '');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c
hirokawaTue Feb 10 19:45:08 2004 EDT Modified files: /php-src/sapi/apache2handlersapi_apache2.c Log: fixed a compilation error. http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.35r2=1.36ty=u Index: php-src/sapi/apache2handler/sapi_apache2.c diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.35 php-src/sapi/apache2handler/sapi_apache2.c:1.36 --- php-src/sapi/apache2handler/sapi_apache2.c:1.35 Mon Feb 9 18:27:42 2004 +++ php-src/sapi/apache2handler/sapi_apache2.c Tue Feb 10 19:45:07 2004 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: sapi_apache2.c,v 1.35 2004/02/09 23:27:42 iliaa Exp $ */ +/* $Id: sapi_apache2.c,v 1.36 2004/02/11 00:45:07 hirokawa Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -424,7 +424,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/mysqli mysqli.c mysqli_api.c
georg Wed Feb 11 02:38:44 2004 EDT
Modified files:
/php-src/ext/mysqli mysqli_api.c mysqli.c
Log:
changed first parameter in mysqli_bind_param from array to string
(as discussed on berlin db meeting)
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.68r2=1.69ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.68 php-src/ext/mysqli/mysqli_api.c:1.69
--- php-src/ext/mysqli/mysqli_api.c:1.68Sat Jan 31 02:51:03 2004
+++ php-src/ext/mysqli/mysqli_api.c Wed Feb 11 02:38:43 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_api.c,v 1.68 2004/01/31 07:51:03 georg Exp $
+ $Id: mysqli_api.c,v 1.69 2004/02/11 07:38:43 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -68,7 +68,7 @@
}
/* }}} */
-/* {{{ proto bool mysqli_bind_param(object stmt, array types, mixed variable
[,mixed,])
+/* {{{ proto bool mysqli_bind_param(object stmt, string types, mixed variable
[,mixed,])
Bind variables to a prepared statement as parameters */
PHP_FUNCTION(mysqli_bind_param)
{
@@ -81,8 +81,8 @@
STMT*stmt;
zval*mysql_stmt;
MYSQL_BIND *bind;
- zval*types;
- HashPositionhpos;
+ char*types;
+ int typelen;
unsigned long rc;
/* calculate and check number of parameters */
@@ -96,7 +96,7 @@
WRONG_PARAM_COUNT;
}
- if (zend_parse_method_parameters((getThis()) ? 1:2 TSRMLS_CC, getThis(), Oa,
mysql_stmt, mysqli_stmt_class_entry, types) == FAILURE) {
+ if (zend_parse_method_parameters((getThis()) ? 1:2 TSRMLS_CC, getThis(), Os,
mysql_stmt, mysqli_stmt_class_entry, types, typelen) == FAILURE) {
return;
}
@@ -106,9 +106,9 @@
start = 1;
}
- if (zend_hash_num_elements(Z_ARRVAL_P(types)) != argc - start) {
- /* number of bind variables doesn't match number of elements in array
*/
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Number of elements in
type array doesn't match number of bind variables);
+ if (strlen(types) != argc - start) {
+ /* number of bind variables doesn't match number of elements in type
definition string */
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Number of elements in
type definition string doesn't match number of bind variables);
}
/* prevent leak if variables are already bound */
@@ -126,35 +126,30 @@
stmt-param.is_null = ecalloc(num_vars, sizeof(char));
bind = (MYSQL_BIND *)ecalloc(num_vars, sizeof(MYSQL_BIND));
- zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(types), hpos);
-
ofs = 0;
for (i=start; i argc; i++) {
- zval **ctype;
-
- zend_hash_get_current_data_ex(Z_ARRVAL_P(types), (void **)ctype,
hpos);
/* set specified type */
- switch (Z_LVAL_PP(ctype)) {
- case MYSQLI_BIND_DOUBLE:
+ switch (types[ofs]) {
+ case 'd': /* Double */
bind[ofs].buffer_type = MYSQL_TYPE_DOUBLE;
bind[ofs].buffer = (gptr)Z_DVAL_PP(args[i]);
bind[ofs].is_null = stmt-param.is_null[ofs];
break;
- case MYSQLI_BIND_INT:
+ case 'i': /* Integer */
bind[ofs].buffer_type = MYSQL_TYPE_LONG;
bind[ofs].buffer = (gptr)Z_LVAL_PP(args[i]);
bind[ofs].is_null = stmt-param.is_null[ofs];
break;
- case MYSQLI_BIND_SEND_DATA:
+ case 'b': /* Blob (send data) */
bind[ofs].buffer_type = MYSQL_TYPE_VAR_STRING;
bind[ofs].is_null = 0;
bind[ofs].length = 0;
break;
- case MYSQLI_BIND_STRING:
+ case 's': /* string */
bind[ofs].buffer_type = MYSQL_TYPE_VAR_STRING;
bind[ofs].buffer = NULL;
bind[ofs].buffer_length = 0;
@@ -162,14 +157,13 @@
break;
default:
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Undefined
fieldtype %ld (parameter %d), Z_LVAL_PP(args[i]), i+1);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Undefined
fieldtype %c (parameter %d), types[ofs], i+1);
[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
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 http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/017.phpt?r1=1.2r2=1.3ty=u Index: php-src/ext/mysqli/tests/017.phpt diff -u php-src/ext/mysqli/tests/017.phpt:1.2 php-src/ext/mysqli/tests/017.phpt:1.3 --- php-src/ext/mysqli/tests/017.phpt:1.2 Sat Jun 28 17:30:58 2003 +++ php-src/ext/mysqli/tests/017.phpt Wed Feb 11 02:39:28 2004 @@ -9,16 +9,16 @@ mysqli_select_db($link, test); - $stmt = mysqli_prepare($link, SELECT current_user(), database()); - mysqli_bind_result($stmt, $c0, $c1); + $stmt = mysqli_prepare($link, SELECT current_user(), database(), 'foo'); + mysqli_bind_result($stmt, $c0, $c1, $c2); mysqli_execute($stmt); mysqli_fetch($stmt); +// mysqli_stmt_close($stmt); - $test = array($c0, $c1); + $test = array($c0, $c1, $c2); var_dump($test); - mysqli_close($link); ? --EXPECT-- http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/019.phpt?r1=1.2r2=1.3ty=u Index: php-src/ext/mysqli/tests/019.phpt diff -u php-src/ext/mysqli/tests/019.phpt:1.2 php-src/ext/mysqli/tests/019.phpt:1.3 --- php-src/ext/mysqli/tests/019.phpt:1.2 Sat Jun 28 17:30:58 2003 +++ php-src/ext/mysqli/tests/019.phpt Wed Feb 11 02:39:28 2004 @@ -19,7 +19,7 @@ col11 char(20))); $stmt= mysqli_prepare($link,INSERT INTO insert_read(col1,col10, col11) VALUES(?,?,?)); - mysqli_bind_param($stmt, array(MYSQLI_BIND_INT, MYSQLI_BIND_STRING, MYSQLI_BIND_STRING), $c1, $c2, $c3); + mysqli_bind_param($stmt, iss, $c1, $c2, $c3); $c1 = 1; $c2 = foo; http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/020.phpt?r1=1.2r2=1.3ty=u Index: php-src/ext/mysqli/tests/020.phpt diff -u php-src/ext/mysqli/tests/020.phpt:1.2 php-src/ext/mysqli/tests/020.phpt:1.3 --- php-src/ext/mysqli/tests/020.phpt:1.2 Sat Jun 28 17:30:58 2003 +++ php-src/ext/mysqli/tests/020.phpt Wed Feb 11 02:39:28 2004 @@ -18,9 +18,7 @@ c7 timestamp(6))); $stmt = mysqli_prepare($link, INSERT INTO test_bind_result VALUES (?,?,?,?,?,?,?)); - mysqli_bind_param($stmt, array(MYSQLI_BIND_STRING, MYSQLI_BIND_STRING, MYSQLI_BIND_STRING, MYSQLI_BIND_STRING, -MYSQLI_BIND_STRING, MYSQLI_BIND_STRING, MYSQLI_BIND_STRING), -$d1, $d2, $d3, $d4, $d5, $d6, $d7); + mysqli_bind_param($stmt, sss, $d1, $d2, $d3, $d4, $d5, $d6, $d7); $d1 = '2002-01-02'; $d2 = '12:49:00'; http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/021.phpt?r1=1.2r2=1.3ty=u Index: php-src/ext/mysqli/tests/021.phpt diff -u php-src/ext/mysqli/tests/021.phpt:1.2 php-src/ext/mysqli/tests/021.phpt:1.3 --- php-src/ext/mysqli/tests/021.phpt:1.2 Sat Jun 28 17:30:58 2003 +++ php-src/ext/mysqli/tests/021.phpt Wed Feb 11 02:39:28 2004 @@ -13,7 +13,7 @@ mysqli_query($link,CREATE TABLE test_bind_fetch(c1 char(10), c2 text)); $stmt = mysqli_prepare($link, INSERT INTO test_bind_fetch VALUES (?,?)); - mysqli_bind_param($stmt, array(MYSQLI_BIND_STRING, MYSQLI_BIND_STRING), $q1, $q2); + mysqli_bind_param($stmt, ss, $q1, $q2); $q1 = 1234567890; $q2 = this is a test; mysqli_execute($stmt); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/022.phpt?r1=1.2r2=1.3ty=u Index: php-src/ext/mysqli/tests/022.phpt diff -u php-src/ext/mysqli/tests/022.phpt:1.2 php-src/ext/mysqli/tests/022.phpt:1.3 --- php-src/ext/mysqli/tests/022.phpt:1.2 Sat Jun 28 17:30:58 2003 +++ php-src/ext/mysqli/tests/022.phpt Wed Feb 11 02:39:28 2004 @@ -14,7 +14,7 @@ $stmt = mysqli_prepare($link, INSERT INTO test_bind_fetch VALUES (?,?)); - mysqli_bind_param($stmt, array(MYSQLI_BIND_STRING, MYSQLI_BIND_STRING), $a1, $a2); + mysqli_bind_param($stmt, ss, $a1, $a2); $a1 = 1234567890; $a2 = str_repeat(A1, 32000); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/023.phpt?r1=1.2r2=1.3ty=u Index: php-src/ext/mysqli/tests/023.phpt diff -u php-src/ext/mysqli/tests/023.phpt:1.2 php-src/ext/mysqli/tests/023.phpt:1.3 --- php-src/ext/mysqli/tests/023.phpt:1.2 Sat Jun 28 17:30:58 2003 +++ php-src/ext/mysqli/tests/023.phpt Wed Feb 11 02:39:28 2004 @@ -19,10 +19,7 @@ c7 int)); $stmt = mysqli_prepare($link, INSERT INTO test_bind_fetch VALUES (?,?,?,?,?,?,?)); - mysqli_bind_param($stmt, array(MYSQLI_BIND_INT,MYSQLI_BIND_INT,MYSQLI_BIND_INT, -
