[PHP-CVS] cvs: CVSROOT / avail
zeevThu Aug 2 14:17:56 2007 UTC Modified files: /CVSROOTavail Log: Give Tzachi karma http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1293r2=1.1294diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1293 CVSROOT/avail:1.1294 --- CVSROOT/avail:1.1293Wed Jul 25 04:10:05 2007 +++ CVSROOT/avail Thu Aug 2 14:17:54 2007 @@ -17,7 +17,7 @@ # The PHP Developers have full access to the full source trees for # PHP, as well as the documentation. -avail|mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac|phpfi,php! 3,php-src,pecl,non-pecl,spl,phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no +avail|mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man|php! fi,php3,php-src,pecl,non-pecl,spl,phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no # fastcgi implementation for IIS avail|shane,wez,edink|fastcgi-isapi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /main SAPI.c
zeevMon Dec 18 12:32:08 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main SAPI.c
Log:
Whitespace
http://cvs.php.net/viewvc.cgi/php-src/main/SAPI.c?r1=1.202.2.7.2.2r2=1.202.2.7.2.3diff_format=u
Index: php-src/main/SAPI.c
diff -u php-src/main/SAPI.c:1.202.2.7.2.2 php-src/main/SAPI.c:1.202.2.7.2.3
--- php-src/main/SAPI.c:1.202.2.7.2.2 Tue Sep 19 20:33:11 2006
+++ php-src/main/SAPI.c Mon Dec 18 12:32:08 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: SAPI.c,v 1.202.2.7.2.2 2006/09/19 20:33:11 dmitry Exp $ */
+/* $Id: SAPI.c,v 1.202.2.7.2.3 2006/12/18 12:32:08 zeev Exp $ */
#include ctype.h
#include sys/stat.h
@@ -540,26 +540,26 @@
}
switch (op) {
- case SAPI_HEADER_SET_STATUS:
- sapi_update_response_code((long) arg TSRMLS_CC);
- return SUCCESS;
+ case SAPI_HEADER_SET_STATUS:
+ sapi_update_response_code((long) arg TSRMLS_CC);
+ return SUCCESS;
+
+ case SAPI_HEADER_REPLACE:
+ case SAPI_HEADER_ADD: {
+ sapi_header_line *p = arg;
+
+ if (!p-line || !p-line_len) {
+ return FAILURE;
+ }
+ header_line = p-line;
+ header_line_len = p-line_len;
+ http_response_code = p-response_code;
+ replace = (op == SAPI_HEADER_REPLACE);
+ break;
+ }
- case SAPI_HEADER_REPLACE:
- case SAPI_HEADER_ADD: {
- sapi_header_line *p = arg;
-
- if (!p-line || !p-line_len) {
+ default:
return FAILURE;
- }
- header_line = p-line;
- header_line_len = p-line_len;
- http_response_code = p-response_code;
- replace = (op == SAPI_HEADER_REPLACE);
- break;
- }
-
- default:
- return FAILURE;
}
header_line = estrndup(header_line, header_line_len);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / php.ini-dist php.ini-recommended
zeevMon Jun 5 16:25:25 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcphp.ini-dist php.ini-recommended Log: ze1 restoration http://cvs.php.net/viewcvs.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.1r2=1.231.2.10.2.2diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.1 php-src/php.ini-dist:1.231.2.10.2.2 --- php-src/php.ini-dist:1.231.2.10.2.1 Wed May 10 19:41:34 2006 +++ php-src/php.ini-distMon Jun 5 16:25:25 2006 @@ -71,6 +71,9 @@ ; Enable the PHP scripting language engine under Apache. engine = On +; Enable compatibility mode with Zend Engine 1 (PHP 4.x) +zend.ze1_compatibility_mode = Off + ; Allow the ? tag. Otherwise, only ?php and script tags are recognized. ; NOTE: Using short tags should be avoided when developing applications or ; libraries that are meant for redistribution, or deployment on PHP http://cvs.php.net/viewcvs.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.1r2=1.179.2.11.2.2diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.1 php-src/php.ini-recommended:1.179.2.11.2.2 --- php-src/php.ini-recommended:1.179.2.11.2.1 Wed May 10 19:41:34 2006 +++ php-src/php.ini-recommended Mon Jun 5 16:25:25 2006 @@ -129,6 +129,9 @@ ; Enable the PHP scripting language engine under Apache. engine = On +; Enable compatibility mode with Zend Engine 1 (PHP 4.x) +zend.ze1_compatibility_mode = Off + ; Allow the ? tag. Otherwise, only ?php and script tags are recognized. ; NOTE: Using short tags should be avoided when developing applications or ; libraries that are meant for redistribution, or deployment on PHP -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/dom php_dom.c /ext/simplexml simplexml.c
zeevMon Jun 5 16:53:22 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/domphp_dom.c
/php-src/ext/simplexml simplexml.c
Log:
Final ze1_compat restoration - it was mostly done by hand, so if anybody
spots any (new) problems, let me know. Test wise, the same tests that
failed before are failing now.
http://cvs.php.net/viewcvs.cgi/php-src/ext/dom/php_dom.c?r1=1.73.2.12.2.4r2=1.73.2.12.2.5diff_format=u
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.73.2.12.2.4
php-src/ext/dom/php_dom.c:1.73.2.12.2.5
--- php-src/ext/dom/php_dom.c:1.73.2.12.2.4 Mon May 22 17:12:25 2006
+++ php-src/ext/dom/php_dom.c Mon Jun 5 16:53:21 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_dom.c,v 1.73.2.12.2.4 2006/05/22 17:12:25 rrichards Exp $ */
+/* $Id: php_dom.c,v 1.73.2.12.2.5 2006/06/05 16:53:21 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -69,6 +69,7 @@
zend_class_entry *dom_namespace_node_class_entry;
zend_object_handlers dom_object_handlers;
+zend_object_handlers dom_ze1_object_handlers;
static HashTable classes;
@@ -490,12 +491,25 @@
return retval;
}
+
+zend_object_value dom_objects_ze1_clone_obj(zval *zobject TSRMLS_DC)
+{
+ php_error(E_ERROR, Cannot clone object of class %s due to
'zend.ze1_compatibility_mode', Z_OBJCE_P(zobject)-name);
+ /* Return zobject-value.obj just to satisfy compiler */
+ return zobject-value.obj;
+}
+
static zend_function_entry dom_functions[] = {
PHP_FE(dom_import_simplexml, NULL)
{NULL, NULL, NULL}
};
static zend_object_handlers* dom_get_obj_handlers(TSRMLS_D) {
+ if (EG(ze1_compatibility_mode)) {
+ return dom_ze1_object_handlers;
+ } else {
+ return dom_object_handlers;
+ }
return dom_object_handlers;
}
@@ -535,6 +549,13 @@
dom_object_handlers.clone_obj = dom_objects_store_clone_obj;
dom_object_handlers.has_property = dom_property_exists;
+ memcpy(dom_ze1_object_handlers, zend_get_std_object_handlers(),
sizeof(zend_object_handlers));
+ dom_ze1_object_handlers.read_property = dom_read_property;
+ dom_ze1_object_handlers.write_property = dom_write_property;
+ dom_object_handlers.get_property_ptr_ptr = dom_get_property_ptr_ptr;
+ dom_ze1_object_handlers.clone_obj = dom_objects_ze1_clone_obj;
+ dom_ze1_object_handlers.has_property = dom_property_exists;
+
zend_hash_init(classes, 0, NULL, NULL, 1);
INIT_CLASS_ENTRY(ce, DOMException,
php_dom_domexception_class_functions);
http://cvs.php.net/viewcvs.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.5r2=1.151.2.22.2.6diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.5
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.6
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.5Tue May 23 22:24:43 2006
+++ php-src/ext/simplexml/simplexml.c Mon Jun 5 16:53:21 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.151.2.22.2.5 2006/05/23 22:24:43 helly Exp $ */
+/* $Id: simplexml.c,v 1.151.2.22.2.6 2006/06/05 16:53:21 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1689,6 +1689,38 @@
sxe_count_elements
};
+static zend_object_handlers sxe_ze1_object_handlers = {
+ ZEND_OBJECTS_STORE_HANDLERS,
+ sxe_property_read,
+ sxe_property_write,
+ sxe_dimension_read,
+ sxe_dimension_write,
+ sxe_property_get_adr,
+ sxe_get_value, /* get */
+ NULL,
+ sxe_property_exists,
+ sxe_property_delete,
+ sxe_dimension_exists,
+ sxe_dimension_delete,
+ sxe_properties_get,
+ NULL, /* zend_get_std_object_handlers()-get_method,*/
+ NULL, /* zend_get_std_object_handlers()-call_method,*/
+ NULL, /* zend_get_std_object_handlers()-get_constructor, */
+ NULL, /* zend_get_std_object_handlers()-get_class_entry,*/
+ NULL, /* zend_get_std_object_handlers()-get_class_name,*/
+ sxe_objects_compare,
+ sxe_object_cast,
+ sxe_count_elements
+};
+
+static zend_object_value sxe_object_ze1_clone(zval *zobject TSRMLS_DC)
+{
+ php_error(E_ERROR, Cannot clone object of class %s due to
'zend.ze1_compatibility_mode', Z_OBJCE_P(zobject)-name);
+ /* Return zobject-value.obj just to satisfy compiler */
+ /* FIXME: Should not be a fatal */
+ return zobject-value.obj;
+}
+
/* {{{ sxe_object_clone()
*/
static void
@@ -2239,6 +2271,12 @@
sxe_object_handlers.get_class_entry =
zend_get_std_object_handlers()-get_class_entry;
sxe_object_handlers.get_class_name =
zend_get_std_object_handlers()-get_class_name;
+ sxe_ze1_object_handlers.get_method =
zend_get_std_object_handlers()-get_method;
+
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/mysqli mysqli_fe.c
zeevMon Dec 26 09:28:38 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/mysqli mysqli_fe.c
Log:
Whitespace fix (don't ask :)
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/mysqli_fe.c?r1=1.49.2.3r2=1.49.2.4diff_format=u
Index: php-src/ext/mysqli/mysqli_fe.c
diff -u php-src/ext/mysqli/mysqli_fe.c:1.49.2.3
php-src/ext/mysqli/mysqli_fe.c:1.49.2.4
--- php-src/ext/mysqli/mysqli_fe.c:1.49.2.3 Tue Dec 6 01:38:54 2005
+++ php-src/ext/mysqli/mysqli_fe.c Mon Dec 26 09:28:38 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_fe.c,v 1.49.2.3 2005/12/06 01:38:54 sniper Exp $
+ $Id: mysqli_fe.c,v 1.49.2.4 2005/12/26 09:28:38 zeev Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -158,22 +158,15 @@
PHP_FE(mysqli_warning_count,
NULL)
/* Aliases */
- PHP_FALIAS(mysqli_bind_param,
- mysqli_stmt_bind_param,
third_arg_force_by_ref_rest)
- PHP_FALIAS(mysqli_bind_result,
- mysqli_stmt_bind_result,
second_arg_force_by_ref_rest)
- PHP_FALIAS(mysqli_client_encoding,
- mysqli_character_set_name,
NULL)
- PHP_FALIAS(mysqli_escape_string,
- mysqli_real_escape_string,
NULL)
- PHP_FALIAS(mysqli_fetch, mysqli_stmt_fetch, NULL)
- PHP_FALIAS(mysqli_param_count,
- mysqli_stmt_param_count,
NULL)
- PHP_FALIAS(mysqli_get_metadata,
- mysqli_stmt_result_metadata,
NULL)
- PHP_FALIAS(mysqli_send_long_data,
- mysqli_stmt_send_long_data,
NULL)
- PHP_FALIAS(mysqli_set_opt, mysqli_options, NULL)
+ PHP_FALIAS(mysqli_bind_param, mysqli_stmt_bind_param,
third_arg_force_by_ref_rest)
+ PHP_FALIAS(mysqli_bind_result, mysqli_stmt_bind_result,
second_arg_force_by_ref_rest)
+ PHP_FALIAS(mysqli_client_encoding, mysqli_character_set_name,
NULL)
+ PHP_FALIAS(mysqli_escape_string,mysqli_real_escape_string,
NULL)
+ PHP_FALIAS(mysqli_fetch,mysqli_stmt_fetch,
NULL)
+ PHP_FALIAS(mysqli_param_count, mysqli_stmt_param_count,
NULL)
+ PHP_FALIAS(mysqli_get_metadata, mysqli_stmt_result_metadata,
NULL)
+ PHP_FALIAS(mysqli_send_long_data, mysqli_stmt_send_long_data,
NULL)
+ PHP_FALIAS(mysqli_set_opt, mysqli_options,
NULL)
{NULL, NULL, NULL} /* Must be the last line in mysqli_functions[]
*/
};
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli mysqli_fe.c
zeevMon Dec 26 09:30:40 2005 EDT
Modified files:
/php-src/ext/mysqli mysqli_fe.c
Log:
Whitespace
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/mysqli_fe.c?r1=1.51r2=1.52diff_format=u
Index: php-src/ext/mysqli/mysqli_fe.c
diff -u php-src/ext/mysqli/mysqli_fe.c:1.51 php-src/ext/mysqli/mysqli_fe.c:1.52
--- php-src/ext/mysqli/mysqli_fe.c:1.51 Tue Dec 6 01:38:43 2005
+++ php-src/ext/mysqli/mysqli_fe.c Mon Dec 26 09:30:40 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_fe.c,v 1.51 2005/12/06 01:38:43 sniper Exp $
+ $Id: mysqli_fe.c,v 1.52 2005/12/26 09:30:40 zeev Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -158,22 +158,15 @@
PHP_FE(mysqli_warning_count,
NULL)
/* Aliases */
- PHP_FALIAS(mysqli_bind_param,
- mysqli_stmt_bind_param,
third_arg_force_by_ref_rest)
- PHP_FALIAS(mysqli_bind_result,
- mysqli_stmt_bind_result,
second_arg_force_by_ref_rest)
- PHP_FALIAS(mysqli_client_encoding,
- mysqli_character_set_name,
NULL)
- PHP_FALIAS(mysqli_escape_string,
- mysqli_real_escape_string,
NULL)
- PHP_FALIAS(mysqli_fetch, mysqli_stmt_fetch, NULL)
- PHP_FALIAS(mysqli_param_count,
- mysqli_stmt_param_count,
NULL)
- PHP_FALIAS(mysqli_get_metadata,
- mysqli_stmt_result_metadata,
NULL)
- PHP_FALIAS(mysqli_send_long_data,
- mysqli_stmt_send_long_data,
NULL)
- PHP_FALIAS(mysqli_set_opt, mysqli_options, NULL)
+ PHP_FALIAS(mysqli_bind_param, mysqli_stmt_bind_param,
third_arg_force_by_ref_rest)
+ PHP_FALIAS(mysqli_bind_result, mysqli_stmt_bind_result,
second_arg_force_by_ref_rest)
+ PHP_FALIAS(mysqli_client_encoding, mysqli_character_set_name,
NULL)
+ PHP_FALIAS(mysqli_escape_string,mysqli_real_escape_string,
NULL)
+ PHP_FALIAS(mysqli_fetch,mysqli_stmt_fetch,
NULL)
+ PHP_FALIAS(mysqli_param_count, mysqli_stmt_param_count,
NULL)
+ PHP_FALIAS(mysqli_get_metadata, mysqli_stmt_result_metadata,
NULL)
+ PHP_FALIAS(mysqli_send_long_data, mysqli_stmt_send_long_data,
NULL)
+ PHP_FALIAS(mysqli_set_opt, mysqli_options,
NULL)
{NULL, NULL, NULL} /* Must be the last line in mysqli_functions[]
*/
};
--
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 config.w32 config9.m4
zeevSun Dec 25 12:45:01 2005 EDT
Modified files:
/php-src/sapi/cgi cgi_main.c config.w32 config9.m4
Log:
Reimplement FastCGI interface
Due to licensing restrictions that actually don't allow anybody to use
the libfcgi code without prior approval from Open Market, which is
impossible to obtain - we decided to reimplement this interface from
scratch. The result is actually slightly faster, and more importantly,
clear of any copyright issues.
Implementation by Dmitry
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.272r2=1.273diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.272 php-src/sapi/cgi/cgi_main.c:1.273
--- php-src/sapi/cgi/cgi_main.c:1.272 Fri Dec 9 16:58:02 2005
+++ php-src/sapi/cgi/cgi_main.c Sun Dec 25 12:45:01 2005
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.272 2005/12/09 16:58:02 dmitry Exp $ */
+/* $Id: cgi_main.c,v 1.273 2005/12/25 12:45:01 zeev Exp $ */
#include php.h
#include php_globals.h
@@ -78,9 +78,8 @@
#include php_getopt.h
-#include fcgi_config.h
-#include fcgiapp.h
-/* don't want to include fcgios.h, causes conflicts */
+#include fastcgi.h
+
#ifdef PHP_WIN32
extern int OS_SetImpersonate(void);
#else
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/config.w32?r1=1.3r2=1.4diff_format=u
Index: php-src/sapi/cgi/config.w32
diff -u php-src/sapi/cgi/config.w32:1.3 php-src/sapi/cgi/config.w32:1.4
--- php-src/sapi/cgi/config.w32:1.3 Wed Nov 23 18:08:51 2005
+++ php-src/sapi/cgi/config.w32 Sun Dec 25 12:45:01 2005
@@ -1,10 +1,9 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.3 2005/11/23 18:08:51 dmitry Exp $
+// $Id: config.w32,v 1.4 2005/12/25 12:45:01 zeev Exp $
ARG_ENABLE('cgi', 'Build CGI version of PHP', 'yes');
if (PHP_CGI == yes) {
- SAPI('cgi', 'cgi_main.c getopt.c', 'php-cgi.exe', '/I
sapi/cgi/libfcgi/include /D FCGI_STATIC');
- ADD_SOURCES('sapi/cgi/libfcgi', 'fcgi_stdio.c fcgiapp.c os_win32.c',
'cgi');
+ SAPI('cgi', 'cgi_main.c getopt.c fastcgi.c', 'php-cgi.exe');
ADD_FLAG('LIBS_CGI', 'ws2_32.lib kernel32.lib advapi32.lib');
}
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/config9.m4?r1=1.18r2=1.19diff_format=u
Index: php-src/sapi/cgi/config9.m4
diff -u php-src/sapi/cgi/config9.m4:1.18 php-src/sapi/cgi/config9.m4:1.19
--- php-src/sapi/cgi/config9.m4:1.18Wed Nov 23 18:08:51 2005
+++ php-src/sapi/cgi/config9.m4 Sun Dec 25 12:45:01 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config9.m4,v 1.18 2005/11/23 18:08:51 dmitry Exp $
+dnl $Id: config9.m4,v 1.19 2005/12/25 12:45:01 zeev Exp $
dnl
AC_ARG_ENABLE(cgi,
@@ -45,6 +45,32 @@
if test $PHP_SAPI_CGI != no; then
AC_MSG_RESULT(yes)
+AC_MSG_CHECKING([for socklen_t in sys/socket.h])
+AC_EGREP_HEADER([socklen_t], [sys/socket.h],
+ [AC_MSG_RESULT([yes])
+ AC_DEFINE([HAVE_SOCKLEN_T], [1],
+[Define if the socklen_t typedef is in sys/socket.h])],
+ AC_MSG_RESULT([no]))
+
+AC_MSG_CHECKING([for sun_len in sys/un.h])
+AC_EGREP_HEADER([sun_len], [sys/un.h],
+ [AC_MSG_RESULT([yes])
+ AC_DEFINE([HAVE_SOCKADDR_UN_SUN_LEN], [1],
+[Define if sockaddr_un in sys/un.h contains a sun_len component])],
+ AC_MSG_RESULT([no]))
+
+AC_MSG_CHECKING([whether cross-process locking is required by accept()])
+case `uname -sr` in
+ IRIX\ 5.* | SunOS\ 5.* | UNIX_System_V\ 4.0)
+AC_MSG_RESULT([yes])
+AC_DEFINE([USE_LOCKING], [1],
+ [Define if cross-process locking is required by accept()])
+ ;;
+ *)
+AC_MSG_RESULT([no])
+ ;;
+esac
+
PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/cgi/Makefile.frag)
case $host_alias in
*cygwin* )
@@ -58,11 +84,8 @@
PHP_TEST_WRITE_STDOUT
-PHP_ADD_BUILD_DIR($abs_builddir/sapi/cgi/libfcgi)
-PHP_FCGI_INCLUDE=-I$abs_srcdir/sapi/cgi/libfcgi/include
-
INSTALL_IT=@echo \Installing PHP CGI into:
\$(INSTALL_ROOT)\$(bindir)/\; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH)
\$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)\$(EXEEXT)
-PHP_SELECT_SAPI(cgi, program, libfcgi/fcgi_stdio.c libfcgi/fcgiapp.c
libfcgi/os_unix.c cgi_main.c getopt.c, $PHP_FCGI_INCLUDE, '$(SAPI_CGI_PATH)')
+PHP_SELECT_SAPI(cgi, program, fastcgi.c cgi_main.c getopt.c, '',
'$(SAPI_CGI_PATH)')
case $host_alias in
*aix*)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/cgi fastcgi.c fastcgi.h
zeevMon Dec 26 07:25:45 2005 EDT
Added files:
/php-src/sapi/cgi fastcgi.c fastcgi.h
Log:
Commit missing files - sorry!
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/fastcgi.c?view=markuprev=1.1
Index: php-src/sapi/cgi/fastcgi.c
+++ php-src/sapi/cgi/fastcgi.c
/*
+--+
| PHP Version 5|
+--+
| Copyright (c) 1997-2005 The PHP Group|
+--+
| This source file is subject to version 3.0 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is|
| available through the world-wide-web at the following url: |
| http://www.php.net/license/3_0.txt. |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| [EMAIL PROTECTED] so we can mail you a copy immediately. |
+--+
| Authors: Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
/* $Id: fastcgi.c,v 1.1 2005/12/26 07:25:45 zeev Exp $ */
#include php_config.h
#include fastcgi.h
#include string.h
#include stdlib.h
#include stdio.h
#include stdarg.h
#include errno.h
#ifndef MAXPATHLEN
# ifdef PATH_MAX
#define MAXPATHLEN PATH_MAX
# else
#define MAXPATHLEN 512
# endif
#endif
#ifdef _WIN32
#include windows.h
# define inline__inline
# define vsnprintf _vsnprintf
typedef int socklen_t;
typedef int ssize_t;
typedef unsigned int size_t;
struct sockaddr_un {
short sun_family;
charsun_path[MAXPATHLEN];
};
static HANDLE fcgi_accept_mutex = INVALID_HANDLE_VALUE;
static int is_impersonate = 0;
#define FCGI_LOCK(fd) \
if (fcgi_accept_mutex != INVALID_HANDLE_VALUE) { \
DWORD ret; \
while ((ret = WaitForSingleObject(fcgi_accept_mutex, 1000)) ==
WAIT_TIMEOUT) { \
if (in_shutdown) return -1; \
} \
if (ret == WAIT_FAILED) { \
fprintf(stderr, WaitForSingleObject() failed\n); \
return -1; \
} \
}
#define FCGI_UNLOCK(fd) \
if (fcgi_accept_mutex != INVALID_HANDLE_VALUE) { \
ReleaseMutex(fcgi_accept_mutex); \
}
#else
# include sys/types.h
# include sys/stat.h
# include unistd.h
# include fcntl.h
# include sys/socket.h
# include sys/un.h
# include netinet/in.h
# include arpa/inet.h
# include netdb.h
# include sys/signal.h
# ifndef HAVE_SOCKLEN_T
typedef unsigned int socklen_t;
# endif
# ifdef USE_LOCKING
# define FCGI_LOCK(fd)
\
do {
\
struct flock lock;
\
lock.l_type = F_WRLCK;
\
lock.l_start = 0;
\
lock.l_whence = SEEK_SET;
\
lock.l_len = 0;
\
if (fcntl(fd, F_SETLKW, lock) != -1) { \
break;
\
} else if (errno != EINTR || in_shutdown) { \
return -1;
\
}
\
} while (1)
# define FCGI_UNLOCK(fd)
\
do {
\
int orig_errno = errno;
\
while (1) {
\
struct flock lock;
\
lock.l_type = F_UNLCK;
\
lock.l_start = 0;
\
lock.l_whence = SEEK_SET;
\
lock.l_len = 0;
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/mysqli mysqli_nonapi.c
zeevThu Dec 22 14:55:55 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/mysqli mysqli_nonapi.c
Log:
Fix prototype
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.54.2.2r2=1.54.2.3diff_format=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.2
php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.3
--- php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.2 Mon Oct 10 20:06:35 2005
+++ php-src/ext/mysqli/mysqli_nonapi.c Thu Dec 22 14:55:55 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_nonapi.c,v 1.54.2.2 2005/10/10 20:06:35 tony2001 Exp $
+ $Id: mysqli_nonapi.c,v 1.54.2.3 2005/12/22 14:55:55 zeev Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -335,7 +335,7 @@
#endif
#ifdef HAVE_MYSQLI_GET_CHARSET
-/* {{{ object mysqli_get_charset(object link)
+/* {{{ proto object mysqli_get_charset(object link)
returns a character set object */
PHP_FUNCTION(mysqli_get_charset)
{
--
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_nonapi.c
zeevThu Dec 22 14:56:29 2005 EDT
Modified files:
/php-src/ext/mysqli mysqli_nonapi.c
Log:
Fix prototype (MFB)
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.56r2=1.57diff_format=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.56
php-src/ext/mysqli/mysqli_nonapi.c:1.57
--- php-src/ext/mysqli/mysqli_nonapi.c:1.56 Mon Oct 10 20:16:35 2005
+++ php-src/ext/mysqli/mysqli_nonapi.c Thu Dec 22 14:56:29 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_nonapi.c,v 1.56 2005/10/10 20:16:35 tony2001 Exp $
+ $Id: mysqli_nonapi.c,v 1.57 2005/12/22 14:56:29 zeev Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -335,7 +335,7 @@
#endif
#ifdef HAVE_MYSQLI_GET_CHARSET
-/* {{{ object mysqli_get_charset(object link)
+/* {{{ proto object mysqli_get_charset(object link)
returns a character set object */
PHP_FUNCTION(mysqli_get_charset)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/spl spl_directory.c
zeevSun Dec 18 14:00:23 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/splspl_directory.c
Log:
Fix prototype
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_directory.c?r1=1.45.2.8r2=1.45.2.9diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.45.2.8
php-src/ext/spl/spl_directory.c:1.45.2.9
--- php-src/ext/spl/spl_directory.c:1.45.2.8Wed Dec 14 09:55:11 2005
+++ php-src/ext/spl/spl_directory.c Sun Dec 18 14:00:23 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_directory.c,v 1.45.2.8 2005/12/14 09:55:11 helly Exp $ */
+/* $Id: spl_directory.c,v 1.45.2.9 2005/12/18 14:00:23 zeev Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -1567,8 +1567,8 @@
RETURN_LONG((long)intern-u.file.max_line_len);
} /* }}} */
-/* {{{ proto bool SplFileObjecthasChildren()
- Rturn false */
+/* {{{ proto bool SplFileObject::hasChildren()
+ Return false */
SPL_METHOD(SplFileObject, hasChildren)
{
RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl spl_directory.c
zeevSun Dec 18 14:05:23 2005 EDT
Modified files:
/php-src/ext/splspl_directory.c
Log:
Fix prototype (MFB)
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_directory.c?r1=1.61r2=1.62diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.61
php-src/ext/spl/spl_directory.c:1.62
--- php-src/ext/spl/spl_directory.c:1.61Wed Dec 14 09:55:04 2005
+++ php-src/ext/spl/spl_directory.c Sun Dec 18 14:05:23 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_directory.c,v 1.61 2005/12/14 09:55:04 helly Exp $ */
+/* $Id: spl_directory.c,v 1.62 2005/12/18 14:05:23 zeev Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -1563,8 +1563,8 @@
RETURN_LONG((long)intern-u.file.max_line_len);
} /* }}} */
-/* {{{ proto bool SplFileObjecthasChildren()
- Rturn false */
+/* {{{ proto bool SplFileObject::hasChildren()
+ Return false */
SPL_METHOD(SplFileObject, hasChildren)
{
RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /main/streams userspace.c
zeevSun Dec 18 15:38:08 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/main/streams userspace.c
Log:
Fix prototype
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/userspace.c?r1=1.31r2=1.31.2.1diff_format=u
Index: php-src/main/streams/userspace.c
diff -u php-src/main/streams/userspace.c:1.31
php-src/main/streams/userspace.c:1.31.2.1
--- php-src/main/streams/userspace.c:1.31 Wed Aug 3 14:08:43 2005
+++ php-src/main/streams/userspace.cSun Dec 18 15:38:08 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: userspace.c,v 1.31 2005/08/03 14:08:43 sniper Exp $ */
+/* $Id: userspace.c,v 1.31.2.1 2005/12/18 15:38:08 zeev Exp $ */
#include php.h
#include php_globals.h
@@ -437,7 +437,7 @@
}
/* }}} */
-/* {{{ bool stream_wrapper_unregister(string protocol)
+/* {{{ proto bool stream_wrapper_unregister(string protocol)
Unregister a wrapper for the life of the current request. */
PHP_FUNCTION(stream_wrapper_unregister)
{
@@ -458,7 +458,7 @@
}
/* }}} */
-/* {{{ bool stream_wrapper_restore(string protocol)
+/* {{{ proto bool stream_wrapper_restore(string protocol)
Restore the original protocol handler, overriding if necessary */
PHP_FUNCTION(stream_wrapper_restore)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/spl php_spl.c
zeevSun Dec 18 15:40:34 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/splphp_spl.c
Log:
Fix protos
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/php_spl.c?r1=1.52.2.21r2=1.52.2.22diff_format=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.52.2.21 php-src/ext/spl/php_spl.c:1.52.2.22
--- php-src/ext/spl/php_spl.c:1.52.2.21 Fri Dec 16 23:58:38 2005
+++ php-src/ext/spl/php_spl.c Sun Dec 18 15:40:34 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_spl.c,v 1.52.2.21 2005/12/16 23:58:38 helly Exp $ */
+/* $Id: php_spl.c,v 1.52.2.22 2005/12/18 15:40:34 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -83,7 +83,7 @@
return *ce;
}
-/* {{{ array class_parents(object instance)
+/* {{{ proto array class_parents(object instance)
Return an array containing the names of all parent classes */
PHP_FUNCTION(class_parents)
{
@@ -246,7 +246,7 @@
return 0;
} /* }}} */
-/* {{{ void spl_autoload(string class_name [, string file_extensions])
+/* {{{ proto void spl_autoload(string class_name [, string file_extensions])
Default implementation for __autoload() */
PHP_FUNCTION(spl_autoload)
{
@@ -302,7 +302,7 @@
}
} /* }}} */
-/* {{{ void string spl_autoload_extensions([string file_extensions])
+/* {{{ proto void string spl_autoload_extensions([string file_extensions])
Register and return default file extensions for spl_autoload */
PHP_FUNCTION(spl_autoload_extensions)
{
@@ -336,7 +336,7 @@
}
}
-/* {{{ void spl_autoload_call(string class_name)
+/* {{{ proto void spl_autoload_call(string class_name)
Try all registerd autoload function to load the requested class */
PHP_FUNCTION(spl_autoload_call)
{
@@ -373,7 +373,7 @@
}
} /* }}} */
-/* {{{ void spl_autoload_register([string autoload_function = spl_autoload
[, throw = true]])
+/* {{{ proto void spl_autoload_register([string autoload_function =
spl_autoload [, throw = true]])
Register given function as __autoload() implementation */
PHP_FUNCTION(spl_autoload_register)
{
@@ -469,7 +469,7 @@
}
} /* }}} */
-/* {{{ bool spl_autoload_unregister(string autoload_function)
+/* {{{ proto bool spl_autoload_unregister(string autoload_function)
Unregister given function as __autoload() implementation */
PHP_FUNCTION(spl_autoload_unregister)
{
@@ -511,7 +511,7 @@
RETURN_BOOL(success == SUCCESS);
} /* }}} */
-/* {{{ false|array spl_autoload_functions()
+/* {{{ proto false|array spl_autoload_functions()
Return all registered __autoload() functionns */
PHP_FUNCTION(spl_autoload_functions)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl php_spl.c
zeevSun Dec 18 15:41:22 2005 EDT
Modified files:
/php-src/ext/splphp_spl.c
Log:
Prototype fixes (MFB)
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/php_spl.c?r1=1.78r2=1.79diff_format=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.78 php-src/ext/spl/php_spl.c:1.79
--- php-src/ext/spl/php_spl.c:1.78 Sat Dec 17 00:09:06 2005
+++ php-src/ext/spl/php_spl.c Sun Dec 18 15:41:22 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_spl.c,v 1.78 2005/12/17 00:09:06 helly Exp $ */
+/* $Id: php_spl.c,v 1.79 2005/12/18 15:41:22 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -81,7 +81,7 @@
return *ce;
}
-/* {{{ array class_parents(object instance)
+/* {{{ proto array class_parents(object instance)
Return an array containing the names of all parent classes */
PHP_FUNCTION(class_parents)
{
@@ -246,7 +246,7 @@
return 0;
} /* }}} */
-/* {{{ void spl_autoload(string class_name [, string file_extensions])
+/* {{{ proto void spl_autoload(string class_name [, string file_extensions])
Default implementation for __autoload() */
PHP_FUNCTION(spl_autoload)
{
@@ -302,7 +302,7 @@
}
} /* }}} */
-/* {{{ void string spl_autoload_extensions([string file_extensions])
+/* {{{ proto void string spl_autoload_extensions([string file_extensions])
Register and return default file extensions for spl_autoload */
PHP_FUNCTION(spl_autoload_extensions)
{
@@ -336,7 +336,7 @@
}
}
-/* {{{ void spl_autoload_call(string class_name)
+/* {{{ proto void spl_autoload_call(string class_name)
Try all registerd autoload function to load the requested class */
PHP_FUNCTION(spl_autoload_call)
{
@@ -374,7 +374,7 @@
}
} /* }}} */
-/* {{{ void spl_autoload_register([string autoload_function = spl_autoload
[, throw = true]])
+/* {{{ proto void spl_autoload_register([string autoload_function =
spl_autoload [, throw = true]])
Register given function as __autoload() implementation */
PHP_FUNCTION(spl_autoload_register)
{
@@ -479,7 +479,7 @@
}
} /* }}} */
-/* {{{ bool spl_autoload_unregister(string autoload_function)
+/* {{{ proto bool spl_autoload_unregister(string autoload_function)
Unregister given function as __autoload() implementation */
PHP_FUNCTION(spl_autoload_unregister)
{
@@ -523,7 +523,7 @@
RETURN_BOOL(success == SUCCESS);
} /* }}} */
-/* {{{ false|array spl_autoload_functions()
+/* {{{ proto false|array spl_autoload_functions()
Return all registered __autoload() functionns */
PHP_FUNCTION(spl_autoload_functions)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/spl php_spl.c
zeevSun Dec 18 15:46:46 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/splphp_spl.c
Log:
prototype fix
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/php_spl.c?r1=1.52.2.22r2=1.52.2.23diff_format=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.52.2.22 php-src/ext/spl/php_spl.c:1.52.2.23
--- php-src/ext/spl/php_spl.c:1.52.2.22 Sun Dec 18 15:40:34 2005
+++ php-src/ext/spl/php_spl.c Sun Dec 18 15:46:46 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_spl.c,v 1.52.2.22 2005/12/18 15:40:34 zeev Exp $ */
+/* $Id: php_spl.c,v 1.52.2.23 2005/12/18 15:46:46 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -302,7 +302,7 @@
}
} /* }}} */
-/* {{{ proto void string spl_autoload_extensions([string file_extensions])
+/* {{{ proto string spl_autoload_extensions([string file_extensions])
Register and return default file extensions for spl_autoload */
PHP_FUNCTION(spl_autoload_extensions)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl php_spl.c
zeevSun Dec 18 15:47:04 2005 EDT
Modified files:
/php-src/ext/splphp_spl.c
Log:
Prototype fix (MFB)
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/php_spl.c?r1=1.79r2=1.80diff_format=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.79 php-src/ext/spl/php_spl.c:1.80
--- php-src/ext/spl/php_spl.c:1.79 Sun Dec 18 15:41:22 2005
+++ php-src/ext/spl/php_spl.c Sun Dec 18 15:47:03 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_spl.c,v 1.79 2005/12/18 15:41:22 zeev Exp $ */
+/* $Id: php_spl.c,v 1.80 2005/12/18 15:47:03 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -302,7 +302,7 @@
}
} /* }}} */
-/* {{{ proto void string spl_autoload_extensions([string file_extensions])
+/* {{{ proto string spl_autoload_extensions([string file_extensions])
Register and return default file extensions for spl_autoload */
PHP_FUNCTION(spl_autoload_extensions)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/xmlreader php_xmlreader.c
zeevSun Dec 18 15:58:51 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/xmlreader php_xmlreader.c
Log:
Fix prototypes
http://cvs.php.net/viewcvs.cgi/php-src/ext/xmlreader/php_xmlreader.c?r1=1.13.2.3r2=1.13.2.4diff_format=u
Index: php-src/ext/xmlreader/php_xmlreader.c
diff -u php-src/ext/xmlreader/php_xmlreader.c:1.13.2.3
php-src/ext/xmlreader/php_xmlreader.c:1.13.2.4
--- php-src/ext/xmlreader/php_xmlreader.c:1.13.2.3 Tue Nov 15 14:28:40 2005
+++ php-src/ext/xmlreader/php_xmlreader.c Sun Dec 18 15:58:51 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_xmlreader.c,v 1.13.2.3 2005/11/15 14:28:40 dmitry Exp $ */
+/* $Id: php_xmlreader.c,v 1.13.2.4 2005/12/18 15:58:51 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -491,7 +491,7 @@
#endif
}
-/* {{{ proto boolean close()
+/* {{{ proto boolean XMLReader::close()
Closes xmlreader - current frees resources until xmlTextReaderClose is fixed
in libxml */
PHP_METHOD(xmlreader, close)
{
@@ -508,7 +508,7 @@
RETURN_TRUE;
}
-/* {{{ proto string getAttribute(string name)
+/* {{{ proto string XMLReader::getAttribute(string name)
Get value of an attribute from current element */
PHP_METHOD(xmlreader, getAttribute)
{
@@ -516,7 +516,7 @@
}
/* }}} */
-/* {{{ proto string getAttributeNo(int index)
+/* {{{ proto string XMLReader::getAttributeNo(int index)
Get value of an attribute at index from current element */
PHP_METHOD(xmlreader, getAttributeNo)
{
@@ -545,7 +545,7 @@
}
/* }}} */
-/* {{{ proto string getAttributeNs(string name, string namespaceURI)
+/* {{{ proto string XMLReader::getAttributeNs(string name, string namespaceURI)
Get value of a attribute via name and namespace from current element */
PHP_METHOD(xmlreader, getAttributeNs)
{
@@ -579,7 +579,7 @@
}
/* }}} */
-/* {{{ proto boolean getParserProperty(int property)
+/* {{{ proto boolean XMLReader::getParserProperty(int property)
Indicates wether given property (one of the parser option constants) is set or
not on parser */
PHP_METHOD(xmlreader, getParserProperty)
{
@@ -606,7 +606,7 @@
}
/* }}} */
-/* {{{ proto boolean isValid()
+/* {{{ proto boolean XMLReader::isValid()
Returns boolean indicating if parsed document is valid or not.
Must set XMLREADER_LOADDTD or XMLREADER_VALIDATE parser option prior to the
first call to read
or this method will always return FALSE */
@@ -616,7 +616,7 @@
}
/* }}} */
-/* {{{ proto string lookupNamespace(string prefix)
+/* {{{ proto string XMLReader::lookupNamespace(string prefix)
Return namespaceURI for associated prefix on current node */
PHP_METHOD(xmlreader, lookupNamespace)
{
@@ -624,7 +624,7 @@
}
/* }}} */
-/* {{{ proto boolean moveToAttribute(string name)
+/* {{{ proto boolean XMLReader::moveToAttribute(string name)
Positions reader at specified attribute - Returns TRUE on success and FALSE on
failure */
PHP_METHOD(xmlreader, moveToAttribute)
{
@@ -656,7 +656,7 @@
}
/* }}} */
-/* {{{ proto boolean moveToAttributeNo(int index)
+/* {{{ proto boolean XMLReader::moveToAttributeNo(int index)
Positions reader at attribute at spcecified index.
Returns TRUE on success and FALSE on failure */
PHP_METHOD(xmlreader, moveToAttributeNo)
@@ -683,7 +683,7 @@
}
/* }}} */
-/* {{{ proto boolean moveToAttributeNs(string name, string namespaceURI)
+/* {{{ proto boolean XMLReader::moveToAttributeNs(string name, string
namespaceURI)
Positions reader at attribute spcified by name and namespaceURI.
Returns TRUE on success and FALSE on failure */
PHP_METHOD(xmlreader, moveToAttributeNs)
@@ -716,7 +716,7 @@
}
/* }}} */
-/* {{{ proto boolean moveToElement()
+/* {{{ proto boolean XMLReader::moveToElement()
Moves the position of the current instance to the node that contains the
current Attribute node. */
PHP_METHOD(xmlreader, moveToElement)
{
@@ -724,7 +724,7 @@
}
/* }}} */
-/* {{{ proto boolean moveToFirstAttribute()
+/* {{{ proto boolean XMLReader::moveToFirstAttribute()
Moves the position of the current instance to the first attribute associated
with the current node. */
PHP_METHOD(xmlreader, moveToFirstAttribute)
{
@@ -732,7 +732,7 @@
}
/* }}} */
-/* {{{ proto boolean moveToNextAttribute()
+/* {{{ proto boolean XMLReader::moveToNextAttribute()
Moves the position of the current instance to the next attribute associated
with the current node. */
PHP_METHOD(xmlreader, moveToNextAttribute)
{
@@ -740,7 +740,7 @@
}
/* }}} */
-/* {{{ proto boolean read()
+/* {{{ proto boolean XMLReader::read()
Moves the position of the current instance to the next node in the stream. */
PHP_METHOD(xmlreader, read)
{
@@ -765,7 +765,7 @@
}
/* }}} */
-/* {{{ proto boolean next([string localname])
+/* {{{ proto boolean XMLReader::next([string localname])
Moves the position of the current instance to the next node in the stream. */
PHP_METHOD(xmlreader, next)
{
@@
[PHP-CVS] cvs: php-src /ext/xmlreader php_xmlreader.c
zeevSun Dec 18 16:00:02 2005 EDT
Modified files:
/php-src/ext/xmlreader php_xmlreader.c
Log:
Fix prototypes (MFB)
http://cvs.php.net/viewcvs.cgi/php-src/ext/xmlreader/php_xmlreader.c?r1=1.20r2=1.21diff_format=u
Index: php-src/ext/xmlreader/php_xmlreader.c
diff -u php-src/ext/xmlreader/php_xmlreader.c:1.20
php-src/ext/xmlreader/php_xmlreader.c:1.21
--- php-src/ext/xmlreader/php_xmlreader.c:1.20 Fri Nov 25 15:40:14 2005
+++ php-src/ext/xmlreader/php_xmlreader.c Sun Dec 18 16:00:02 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_xmlreader.c,v 1.20 2005/11/25 15:40:14 sniper Exp $ */
+/* $Id: php_xmlreader.c,v 1.21 2005/12/18 16:00:02 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -489,7 +489,7 @@
#endif
}
-/* {{{ proto boolean close()
+/* {{{ proto boolean XMLReader::close()
Closes xmlreader - current frees resources until xmlTextReaderClose is fixed
in libxml */
PHP_METHOD(xmlreader, close)
{
@@ -506,7 +506,7 @@
RETURN_TRUE;
}
-/* {{{ proto string getAttribute(string name)
+/* {{{ proto string XMLReader::getAttribute(string name)
Get value of an attribute from current element */
PHP_METHOD(xmlreader, getAttribute)
{
@@ -514,7 +514,7 @@
}
/* }}} */
-/* {{{ proto string getAttributeNo(int index)
+/* {{{ proto string XMLReader::getAttributeNo(int index)
Get value of an attribute at index from current element */
PHP_METHOD(xmlreader, getAttributeNo)
{
@@ -543,7 +543,7 @@
}
/* }}} */
-/* {{{ proto string getAttributeNs(string name, string namespaceURI)
+/* {{{ proto string XMLReader::getAttributeNs(string name, string namespaceURI)
Get value of a attribute via name and namespace from current element */
PHP_METHOD(xmlreader, getAttributeNs)
{
@@ -577,7 +577,7 @@
}
/* }}} */
-/* {{{ proto boolean getParserProperty(int property)
+/* {{{ proto boolean XMLReader::getParserProperty(int property)
Indicates wether given property (one of the parser option constants) is set or
not on parser */
PHP_METHOD(xmlreader, getParserProperty)
{
@@ -605,7 +605,7 @@
}
/* }}} */
-/* {{{ proto boolean isValid()
+/* {{{ proto boolean XMLReader::isValid()
Returns boolean indicating if parsed document is valid or not.
Must set XMLREADER_LOADDTD or XMLREADER_VALIDATE parser option prior to the
first call to read
or this method will always return FALSE */
@@ -615,7 +615,7 @@
}
/* }}} */
-/* {{{ proto string lookupNamespace(string prefix)
+/* {{{ proto string XMLReader::lookupNamespace(string prefix)
Return namespaceURI for associated prefix on current node */
PHP_METHOD(xmlreader, lookupNamespace)
{
@@ -623,7 +623,7 @@
}
/* }}} */
-/* {{{ proto boolean moveToAttribute(string name)
+/* {{{ proto boolean XMLReader::moveToAttribute(string name)
Positions reader at specified attribute - Returns TRUE on success and FALSE on
failure */
PHP_METHOD(xmlreader, moveToAttribute)
{
@@ -655,7 +655,7 @@
}
/* }}} */
-/* {{{ proto boolean moveToAttributeNo(int index)
+/* {{{ proto boolean XMLReader::moveToAttributeNo(int index)
Positions reader at attribute at spcecified index.
Returns TRUE on success and FALSE on failure */
PHP_METHOD(xmlreader, moveToAttributeNo)
@@ -683,7 +683,7 @@
}
/* }}} */
-/* {{{ proto boolean moveToAttributeNs(string name, string namespaceURI)
+/* {{{ proto boolean XMLReader::moveToAttributeNs(string name, string
namespaceURI)
Positions reader at attribute spcified by name and namespaceURI.
Returns TRUE on success and FALSE on failure */
PHP_METHOD(xmlreader, moveToAttributeNs)
@@ -716,7 +716,7 @@
}
/* }}} */
-/* {{{ proto boolean moveToElement()
+/* {{{ proto boolean XMLReader::moveToElement()
Moves the position of the current instance to the node that contains the
current Attribute node. */
PHP_METHOD(xmlreader, moveToElement)
{
@@ -724,7 +724,7 @@
}
/* }}} */
-/* {{{ proto boolean moveToFirstAttribute()
+/* {{{ proto boolean XMLReader::moveToFirstAttribute()
Moves the position of the current instance to the first attribute associated
with the current node. */
PHP_METHOD(xmlreader, moveToFirstAttribute)
{
@@ -732,7 +732,7 @@
}
/* }}} */
-/* {{{ proto boolean moveToNextAttribute()
+/* {{{ proto boolean XMLReader::moveToNextAttribute()
Moves the position of the current instance to the next attribute associated
with the current node. */
PHP_METHOD(xmlreader, moveToNextAttribute)
{
@@ -740,7 +740,7 @@
}
/* }}} */
-/* {{{ proto boolean read()
+/* {{{ proto boolean XMLReader::read()
Moves the position of the current instance to the next node in the stream. */
PHP_METHOD(xmlreader, read)
{
@@ -765,7 +765,7 @@
}
/* }}} */
-/* {{{ proto boolean next([string localname])
+/* {{{ proto boolean XMLReader::next([string localname])
Moves the position of the current instance to the next node in the stream. */
PHP_METHOD(xmlreader, next)
{
@@ -807,7 +807,7 @@
}
/* }}} */
-/* {{{ proto
Re: [PHP-CVS] cvs: php-src /ext/reflection config.m4
At 13:16 19/11/2005, Jani Taskinen wrote: On Sat, 19 Nov 2005, Zeev Suraski wrote: At 03:49 19/11/2005, Andi Gutmans wrote: As I mentioned to Marcus, it seems odd to me to move reflection in the first place. It seems to me to be very much a language feature and in my opinion, should always be enabled. I can't really see a good reason for this move. I have to say that I don't see any good reason for this either. The idea of let's make it less broken is vague, I don't see any reason why extensionizing it would help any. The only advantage I heard so far is that various users are likely to bump into various problems, which may make Jani very happy, but is that a real reason to go on? :) I'm not the only one in the world who does not use that and does not need it and would like to be able to disable it on will.. But where do we draw the line? Maybe we also make it possible to disable string functions because you don't use them? Or how about object support, tons of people just use procedural coding and that huge chunk of object implementation code is just pure waste? Before you reply with Yes, excellent idea!!... :) I'm not proposing (and never did) to make it disabled by default. Perhaps we need to extend the --disable-all configure option: --disable-all=everything|most Where 'most' is the default and everything for us purists like you like to say. What I am aiming with all the modularization is to be able to have a very lean PHP build with ONLY the things I allow to be used in our projects.. I don't mind the only the things I allow to be used in our projects part, it should be able to control what's available in PHP in the most granular way possible (that makes sense), through the likes of disable_function. It's the very lean PHP part that I mind, mainly because it has everything to do with WFF, and very little to do with real world effects. And also getting as many of these insignificant memory/speed eaters out. Streams create oceans, you know? :) That's a good one :) Zeev -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/reflection config.m4
At 03:49 19/11/2005, Andi Gutmans wrote: As I mentioned to Marcus, it seems odd to me to move reflection in the first place. It seems to me to be very much a language feature and in my opinion, should always be enabled. I can't really see a good reason for this move. I have to say that I don't see any good reason for this either. The idea of let's make it less broken is vague, I don't see any reason why extensionizing it would help any. The only advantage I heard so far is that various users are likely to bump into various problems, which may make Jani very happy, but is that a real reason to go on? :) Zeev -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS configure.in /main php_version.h
zeevMon Sep 5 06:41:14 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS configure.in /php-src/main php_version.h Log: Roll 5.0.5 http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.474r2=1.1760.2.475ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.474 php-src/NEWS:1.1760.2.475 --- php-src/NEWS:1.1760.2.474 Fri Sep 2 17:12:09 2005 +++ php-src/NEWSMon Sep 5 06:41:11 2005 @@ -1,6 +1,6 @@ PHPNEWS ||| -25 Aug 2005, PHP 5.0.5RC2 +05 Sep 2005, PHP 5.0.5 - Upgraded PCRE library to version 5.0. (Andrei) - Removed php_check_syntax() function which never worked properly. (Ilia) - Added new function mysqli_set_charset(). (Georg) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.514.2.57r2=1.514.2.58ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.514.2.57 php-src/configure.in:1.514.2.58 --- php-src/configure.in:1.514.2.57 Thu Aug 25 14:29:14 2005 +++ php-src/configure.inMon Sep 5 06:41:12 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.514.2.57 2005/08/25 18:29:14 zeev Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.514.2.58 2005/09/05 10:41:12 zeev 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=5 -EXTRA_VERSION=-dev +EXTRA_VERSION= 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.97.2.25r2=1.97.2.26ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.97.2.25 php-src/main/php_version.h:1.97.2.26 --- php-src/main/php_version.h:1.97.2.25Thu Aug 25 14:29:15 2005 +++ php-src/main/php_version.h Mon Sep 5 06:41:14 2005 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 0 #define PHP_RELEASE_VERSION 5 -#define PHP_EXTRA_VERSION -dev -#define PHP_VERSION 5.0.5-dev +#define PHP_EXTRA_VERSION +#define PHP_VERSION 5.0.5 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS configure.in /main php_version.h
zeevMon Sep 5 08:00:36 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS configure.in /php-src/main php_version.h Log: Roll back to dev http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.475r2=1.1760.2.476ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.475 php-src/NEWS:1.1760.2.476 --- php-src/NEWS:1.1760.2.475 Mon Sep 5 06:41:11 2005 +++ php-src/NEWSMon Sep 5 08:00:19 2005 @@ -1,5 +1,7 @@ PHPNEWS ||| +?? ??? , PHP 5.0.6 + 05 Sep 2005, PHP 5.0.5 - Upgraded PCRE library to version 5.0. (Andrei) - Removed php_check_syntax() function which never worked properly. (Ilia) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.514.2.58r2=1.514.2.59ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.514.2.58 php-src/configure.in:1.514.2.59 --- php-src/configure.in:1.514.2.58 Mon Sep 5 06:41:12 2005 +++ php-src/configure.inMon Sep 5 08:00:24 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.514.2.58 2005/09/05 10:41:12 zeev Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.514.2.59 2005/09/05 12:00:24 zeev Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -40,8 +40,8 @@ MAJOR_VERSION=5 MINOR_VERSION=0 -RELEASE_VERSION=5 -EXTRA_VERSION= +RELEASE_VERSION=6 +EXTRA_VERSION=-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.97.2.26r2=1.97.2.27ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.97.2.26 php-src/main/php_version.h:1.97.2.27 --- php-src/main/php_version.h:1.97.2.26Mon Sep 5 06:41:14 2005 +++ php-src/main/php_version.h Mon Sep 5 08:00:35 2005 @@ -2,6 +2,6 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 0 -#define PHP_RELEASE_VERSION 5 -#define PHP_EXTRA_VERSION -#define PHP_VERSION 5.0.5 +#define PHP_RELEASE_VERSION 6 +#define PHP_EXTRA_VERSION -dev +#define PHP_VERSION 5.0.6-dev -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS configure.in /main php_version.h
zeevThu Aug 25 13:10:24 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS configure.in /php-src/main php_version.h Log: Roll RC2 http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.467r2=1.1760.2.468ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.467 php-src/NEWS:1.1760.2.468 --- php-src/NEWS:1.1760.2.467 Sun Aug 21 19:01:23 2005 +++ php-src/NEWSThu Aug 25 13:10:23 2005 @@ -1,6 +1,6 @@ PHPNEWS ||| -21 Aug 2005, PHP 5.0.5RC1 +25 Aug 2005, PHP 5.0.5RC2 - Upgraded PCRE library to version 5.0. (Andrei) - Removed php_check_syntax() function which never worked properly. (Ilia) - Added new function mysqli_set_charset(). (Georg) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.514.2.55r2=1.514.2.56ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.514.2.55 php-src/configure.in:1.514.2.56 --- php-src/configure.in:1.514.2.55 Wed Jul 27 07:44:08 2005 +++ php-src/configure.inThu Aug 25 13:10:23 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.514.2.55 2005/07/27 11:44:08 hyanantha Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.514.2.56 2005/08/25 17:10:23 zeev 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=5 -EXTRA_VERSION=-dev +EXTRA_VERSION=RC2 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.97.2.23r2=1.97.2.24ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.97.2.23 php-src/main/php_version.h:1.97.2.24 --- php-src/main/php_version.h:1.97.2.23Wed Mar 30 17:24:52 2005 +++ php-src/main/php_version.h Thu Aug 25 13:10:24 2005 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 0 #define PHP_RELEASE_VERSION 5 -#define PHP_EXTRA_VERSION -dev -#define PHP_VERSION 5.0.5-dev +#define PHP_EXTRA_VERSION RC2 +#define PHP_VERSION 5.0.5RC2 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / configure.in /main php_version.h
zeevThu Aug 25 14:29:15 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcconfigure.in /php-src/main php_version.h Log: Revert to -dev http://cvs.php.net/diff.php/php-src/configure.in?r1=1.514.2.56r2=1.514.2.57ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.514.2.56 php-src/configure.in:1.514.2.57 --- php-src/configure.in:1.514.2.56 Thu Aug 25 13:10:23 2005 +++ php-src/configure.inThu Aug 25 14:29:14 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.514.2.56 2005/08/25 17:10:23 zeev Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.514.2.57 2005/08/25 18:29:14 zeev 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=5 -EXTRA_VERSION=RC2 +EXTRA_VERSION=-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.97.2.24r2=1.97.2.25ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.97.2.24 php-src/main/php_version.h:1.97.2.25 --- php-src/main/php_version.h:1.97.2.24Thu Aug 25 13:10:24 2005 +++ php-src/main/php_version.h Thu Aug 25 14:29:15 2005 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 0 #define PHP_RELEASE_VERSION 5 -#define PHP_EXTRA_VERSION RC2 -#define PHP_VERSION 5.0.5RC2 +#define PHP_EXTRA_VERSION -dev +#define PHP_VERSION 5.0.5-dev -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
zeevSun Aug 21 11:30:07 2005 EDT Modified files: /CVSROOTavail Log: Add tests karma for Michael http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.1010r2=1.1011ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1010 CVSROOT/avail:1.1011 --- CVSROOT/avail:1.1010Wed Aug 17 11:09:13 2005 +++ CVSROOT/avail Sun Aug 21 11:30:05 2005 @@ -269,7 +269,8 @@ avail|jystewart|pear/Services_Technorati avail|msmarcal|pear/Image_Barcode avail|uw|pecl/maxdb -avail|magnus|Zend/tests,ZendEngine2/tests +avail|magnus,michael|Zend/tests,ZendEngine2/tests +avail|michael|php-src/tests avail|blindman|pecl/colorer avail|mike|pecl/http avail|gabe|pecl/intercept -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /ext/standard array.c basic_functions.c basic_functions.h
zeevSun Aug 21 14:36:35 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/standard array.c basic_functions.c basic_functions.h
Log:
Backport Mike's patch for user sort functions
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.464r2=1.1760.2.465ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.464 php-src/NEWS:1.1760.2.465
--- php-src/NEWS:1.1760.2.464 Wed Aug 17 07:53:59 2005
+++ php-src/NEWSSun Aug 21 14:36:32 2005
@@ -1,6 +1,8 @@
PHPNEWS
|||
?? ??? 2005, PHP 5.0.5
+- Fixed various reentrancy bugs in user-sort functions, solves bugs #33286 and
+ #33295. (Mike Bretz)
- Upgraded PCRE library to version 5.0. (Andrei)
- Removed php_check_syntax() function which never worked properly. (Ilia)
- Added new function mysqli_set_charset(). (Georg)
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.266.2.23r2=1.266.2.24ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.266.2.23
php-src/ext/standard/array.c:1.266.2.24
--- php-src/ext/standard/array.c:1.266.2.23 Wed Aug 10 04:23:52 2005
+++ php-src/ext/standard/array.cSun Aug 21 14:36:33 2005
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.266.2.23 2005/08/10 08:23:52 dmitry Exp $ */
+/* $Id: array.c,v 1.266.2.24 2005/08/21 18:36:33 zeev Exp $ */
#include php.h
#include php_ini.h
@@ -578,43 +578,66 @@
}
}
-/* check is comparison function is valid */
+/* check if comparison function is valid */
#define PHP_ARRAY_CMP_FUNC_CHECK(func_name)\
if (!zend_is_callable(*func_name, 0, NULL)) { \
php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid comparison
function.);\
+ BG(user_compare_fci_cache) = old_user_compare_fci_cache; \
BG(user_compare_func_name) = old_compare_func; \
RETURN_FALSE; \
} \
+/* clear FCI cache otherwise : for example the same or other array with
+ (partly) the same key values has been sorted with uasort() or
+ other sorting function the comparison is cached, however the the name
+ of the function for comparison is not respected. see bug #28739 AND
#33295
+
+ following defines will assist in backup / restore values.
+*/
+
+#define PHP_ARRAY_CMP_FUNC_VARS \
+ zval **old_compare_func; \
+ zend_fcall_info_cache old_user_compare_fci_cache
+
+#define PHP_ARRAY_CMP_FUNC_BACKUP() \
+ old_compare_func = BG(user_compare_func_name); \
+ old_user_compare_fci_cache = BG(user_compare_fci_cache); \
+ BG(user_compare_fci_cache) = empty_fcall_info_cache
+
+#define PHP_ARRAY_CMP_FUNC_RESTORE() \
+BG(user_compare_fci_cache) = old_user_compare_fci_cache; \
+BG(user_compare_func_name) = old_compare_func
+
+
/* {{{ proto bool usort(array array_arg, string cmp_function)
Sort an array by values using a user-defined comparison function */
PHP_FUNCTION(usort)
{
zval **array;
- zval **old_compare_func;
HashTable *target_hash;
+ PHP_ARRAY_CMP_FUNC_VARS;
+
+ PHP_ARRAY_CMP_FUNC_BACKUP();
- old_compare_func = BG(user_compare_func_name);
- BG(user_compare_fci_cache) = empty_fcall_info_cache;
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, array,
BG(user_compare_func_name)) == FAILURE) {
- BG(user_compare_func_name) = old_compare_func;
+ PHP_ARRAY_CMP_FUNC_RESTORE();
WRONG_PARAM_COUNT;
}
target_hash = HASH_OF(*array);
if (!target_hash) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, The argument
should be an array);
- BG(user_compare_func_name) = old_compare_func;
+ PHP_ARRAY_CMP_FUNC_RESTORE();
RETURN_FALSE;
}
PHP_ARRAY_CMP_FUNC_CHECK(BG(user_compare_func_name))
if (zend_hash_sort(target_hash, zend_qsort, array_user_compare, 1
TSRMLS_CC) == FAILURE) {
- BG(user_compare_func_name) = old_compare_func;
+ PHP_ARRAY_CMP_FUNC_RESTORE();
RETURN_FALSE;
}
- BG(user_compare_func_name) = old_compare_func;
+ PHP_ARRAY_CMP_FUNC_RESTORE();
RETURN_TRUE;
}
/* }}} */
@@ -624,29 +647,30 @@
PHP_FUNCTION(uasort)
{
zval **array;
- zval **old_compare_func;
HashTable *target_hash;
+ PHP_ARRAY_CMP_FUNC_VARS;
+
+ PHP_ARRAY_CMP_FUNC_BACKUP();
- old_compare_func = BG(user_compare_func_name);
- BG(user_compare_fci_cache) = empty_fcall_info_cache;
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, array,
BG(user_compare_func_name)) == FAILURE) {
- BG(user_compare_func_name) =
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS
zeevSun Aug 21 14:37:29 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS Log: Roll 5.0.5RC1 http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.465r2=1.1760.2.466ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.465 php-src/NEWS:1.1760.2.466 --- php-src/NEWS:1.1760.2.465 Sun Aug 21 14:36:32 2005 +++ php-src/NEWSSun Aug 21 14:37:28 2005 @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 2005, PHP 5.0.5 +21 Aug 2005, PHP 5.0.5RC1 - Fixed various reentrancy bugs in user-sort functions, solves bugs #33286 and #33295. (Mike Bretz) - Upgraded PCRE library to version 5.0. (Andrei) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/soap soap.c
zeevWed Aug 17 03:02:31 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/soap soap.c
Log:
Add SoapClient::__setSoapHeaders()
http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.110.2.40r2=1.110.2.41ty=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.110.2.40 php-src/ext/soap/soap.c:1.110.2.41
--- php-src/ext/soap/soap.c:1.110.2.40 Wed Jul 6 02:59:07 2005
+++ php-src/ext/soap/soap.c Wed Aug 17 03:02:31 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: soap.c,v 1.110.2.40 2005/07/06 06:59:07 dmitry Exp $ */
+/* $Id: soap.c,v 1.110.2.41 2005/08/17 07:02:31 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -260,6 +260,7 @@
PHP_METHOD(SoapClient, __doRequest);
PHP_METHOD(SoapClient, __setCookie);
PHP_METHOD(SoapClient, __setLocation);
+PHP_METHOD(SoapClient, __setSoapHeaders);
/* SoapVar Functions */
PHP_METHOD(SoapVar, SoapVar);
@@ -348,6 +349,7 @@
PHP_ME(SoapClient, __doRequest, NULL, 0)
PHP_ME(SoapClient, __setCookie, NULL, 0)
PHP_ME(SoapClient, __setLocation, NULL, 0)
+ PHP_ME(SoapClient, __setSoapHeaders, NULL, 0)
{NULL, NULL, NULL}
};
@@ -2443,6 +2445,20 @@
SOAP_CLIENT_END_CODE();
}
+static void verify_soap_headers_array(HashTable *ht)
+{
+ zval **tmp;
+
+ zend_hash_internal_pointer_reset(ht);
+ while (zend_hash_get_current_data(ht, (void**)tmp) == SUCCESS) {
+ if (Z_TYPE_PP(tmp) != IS_OBJECT ||
+ Z_OBJCE_PP(tmp) != soap_header_class_entry) {
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, Invalid SOAP
header);
+ }
+ zend_hash_move_forward(ht);
+ }
+}
+
/* {{{ proto mixed SoapClient::__call ( string function_name [, array
arguments [, array options [, array input_headers [, array output_headers)
Calls a SOAP function */
@@ -2458,6 +2474,8 @@
zval **real_args = NULL;
zval **param;
int arg_count;
+ zval **tmp;
+ zend_bool free_soap_headers;
HashPosition pos;
@@ -2469,8 +2487,6 @@
if (options) {
if (Z_TYPE_P(options) == IS_ARRAY) {
HashTable *ht = Z_ARRVAL_P(options);
- zval **tmp;
-
if (zend_hash_find(ht, location, sizeof(location),
(void**)tmp) == SUCCESS
Z_TYPE_PP(tmp) == IS_STRING) {
location = Z_STRVAL_PP(tmp);
@@ -2492,27 +2508,43 @@
if (headers == NULL || Z_TYPE_P(headers) == IS_NULL) {
} else if (Z_TYPE_P(headers) == IS_ARRAY) {
- zval** tmp;
-
soap_headers = Z_ARRVAL_P(headers);
- zend_hash_internal_pointer_reset(soap_headers);
- while (zend_hash_get_current_data(soap_headers, (void**)tmp)
== SUCCESS) {
- if (Z_TYPE_PP(tmp) != IS_OBJECT ||
- Z_OBJCE_PP(tmp) != soap_header_class_entry) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR,
Invalid SOAP header);
- }
- zend_hash_move_forward(soap_headers);
- }
+ verify_soap_headers_array(soap_headers);
+ free_soap_headers = 0;
} else if (Z_TYPE_P(headers) == IS_OBJECT
Z_OBJCE_P(headers) == soap_header_class_entry) {
- soap_headers = emalloc(sizeof(HashTable));
- zend_hash_init(soap_headers, 0, NULL, NULL/*ZVAL_PTR_DTOR*/, 0);
+ soap_headers = emalloc(sizeof(HashTable));
+ zend_hash_init(soap_headers, 0, NULL, ZVAL_PTR_DTOR, 0);
zend_hash_next_index_insert(soap_headers, headers,
sizeof(zval*), NULL);
- headers = NULL;
+ ZVAL_ADDREF(headers);
+ free_soap_headers = 1;
} else{
php_error_docref(NULL TSRMLS_CC, E_ERROR, Invalid SOAP
header);
}
+ /* Add default headers */
+ if (zend_hash_find(Z_OBJPROP_P(this_ptr), __default_headers,
sizeof(__default_headers), (void **) tmp)==SUCCESS) {
+ HashTable *default_headers = Z_ARRVAL_P(*tmp);
+ if (soap_headers) {
+ if (!free_soap_headers) {
+ HashTable *tmp = emalloc(sizeof(HashTable));
+ zend_hash_init(tmp, 0, NULL, ZVAL_PTR_DTOR, 0);
+ zend_hash_copy(tmp, soap_headers,
(copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+ soap_headers = tmp;
+ free_soap_headers = 1;
+ }
+ zend_hash_internal_pointer_reset(default_headers);
+ while
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/soap soap.c
zeevWed Aug 17 03:04:16 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/soap soap.c
Log:
Introduce SoapClient::__setSoapHeaders()
http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.156r2=1.156.2.1ty=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156 php-src/ext/soap/soap.c:1.156.2.1
--- php-src/ext/soap/soap.c:1.156 Wed Aug 3 10:07:48 2005
+++ php-src/ext/soap/soap.c Wed Aug 17 03:04:16 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: soap.c,v 1.156 2005/08/03 14:07:48 sniper Exp $ */
+/* $Id: soap.c,v 1.156.2.1 2005/08/17 07:04:16 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -260,6 +260,7 @@
PHP_METHOD(SoapClient, __doRequest);
PHP_METHOD(SoapClient, __setCookie);
PHP_METHOD(SoapClient, __setLocation);
+PHP_METHOD(SoapClient, __setSoapHeaders);
/* SoapVar Functions */
PHP_METHOD(SoapVar, SoapVar);
@@ -348,6 +349,7 @@
PHP_ME(SoapClient, __doRequest, NULL, 0)
PHP_ME(SoapClient, __setCookie, NULL, 0)
PHP_ME(SoapClient, __setLocation, NULL, 0)
+ PHP_ME(SoapClient, __setSoapHeaders, NULL, 0)
{NULL, NULL, NULL}
};
@@ -2457,6 +2459,20 @@
SOAP_CLIENT_END_CODE();
}
+static void verify_soap_headers_array(HashTable *ht)
+{
+ zval **tmp;
+
+ zend_hash_internal_pointer_reset(ht);
+ while (zend_hash_get_current_data(ht, (void**)tmp) == SUCCESS) {
+ if (Z_TYPE_PP(tmp) != IS_OBJECT ||
+ Z_OBJCE_PP(tmp) != soap_header_class_entry) {
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, Invalid SOAP
header);
+ }
+ zend_hash_move_forward(ht);
+ }
+}
+
/* {{{ proto mixed SoapClient::__call ( string function_name [, array
arguments [, array options [, array input_headers [, array output_headers)
Calls a SOAP function */
@@ -2472,6 +2488,8 @@
zval **real_args = NULL;
zval **param;
int arg_count;
+ zval **tmp;
+ zend_bool free_soap_headers;
HashPosition pos;
@@ -2483,8 +2501,6 @@
if (options) {
if (Z_TYPE_P(options) == IS_ARRAY) {
HashTable *ht = Z_ARRVAL_P(options);
- zval **tmp;
-
if (zend_hash_find(ht, location, sizeof(location),
(void**)tmp) == SUCCESS
Z_TYPE_PP(tmp) == IS_STRING) {
location = Z_STRVAL_PP(tmp);
@@ -2506,27 +2522,43 @@
if (headers == NULL || Z_TYPE_P(headers) == IS_NULL) {
} else if (Z_TYPE_P(headers) == IS_ARRAY) {
- zval** tmp;
-
soap_headers = Z_ARRVAL_P(headers);
- zend_hash_internal_pointer_reset(soap_headers);
- while (zend_hash_get_current_data(soap_headers, (void**)tmp)
== SUCCESS) {
- if (Z_TYPE_PP(tmp) != IS_OBJECT ||
- Z_OBJCE_PP(tmp) != soap_header_class_entry) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR,
Invalid SOAP header);
- }
- zend_hash_move_forward(soap_headers);
- }
+ verify_soap_headers_array(soap_headers);
+ free_soap_headers = 0;
} else if (Z_TYPE_P(headers) == IS_OBJECT
Z_OBJCE_P(headers) == soap_header_class_entry) {
- soap_headers = emalloc(sizeof(HashTable));
- zend_hash_init(soap_headers, 0, NULL, NULL/*ZVAL_PTR_DTOR*/, 0);
+ soap_headers = emalloc(sizeof(HashTable));
+ zend_hash_init(soap_headers, 0, NULL, ZVAL_PTR_DTOR, 0);
zend_hash_next_index_insert(soap_headers, headers,
sizeof(zval*), NULL);
- headers = NULL;
+ ZVAL_ADDREF(headers);
+ free_soap_headers = 1;
} else{
php_error_docref(NULL TSRMLS_CC, E_ERROR, Invalid SOAP
header);
}
+ /* Add default headers */
+ if (zend_hash_find(Z_OBJPROP_P(this_ptr), __default_headers,
sizeof(__default_headers), (void **) tmp)==SUCCESS) {
+ HashTable *default_headers = Z_ARRVAL_P(*tmp);
+ if (soap_headers) {
+ if (!free_soap_headers) {
+ HashTable *tmp = emalloc(sizeof(HashTable));
+ zend_hash_init(tmp, 0, NULL, ZVAL_PTR_DTOR, 0);
+ zend_hash_copy(tmp, soap_headers,
(copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+ soap_headers = tmp;
+ free_soap_headers = 1;
+ }
+ zend_hash_internal_pointer_reset(default_headers);
+ while
[PHP-CVS] cvs: php-src /ext/soap soap.c
zeevWed Aug 17 03:04:51 2005 EDT
Modified files:
/php-src/ext/soap soap.c
Log:
Add SoapClient::__setSoapHeaders()
http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.157r2=1.158ty=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.157 php-src/ext/soap/soap.c:1.158
--- php-src/ext/soap/soap.c:1.157 Fri Aug 12 10:08:26 2005
+++ php-src/ext/soap/soap.c Wed Aug 17 03:04:50 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: soap.c,v 1.157 2005/08/12 14:08:26 sebastian Exp $ */
+/* $Id: soap.c,v 1.158 2005/08/17 07:04:50 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -260,6 +260,7 @@
PHP_METHOD(SoapClient, __doRequest);
PHP_METHOD(SoapClient, __setCookie);
PHP_METHOD(SoapClient, __setLocation);
+PHP_METHOD(SoapClient, __setSoapHeaders);
/* SoapVar Functions */
PHP_METHOD(SoapVar, SoapVar);
@@ -348,6 +349,7 @@
PHP_ME(SoapClient, __doRequest, NULL, 0)
PHP_ME(SoapClient, __setCookie, NULL, 0)
PHP_ME(SoapClient, __setLocation, NULL, 0)
+ PHP_ME(SoapClient, __setSoapHeaders, NULL, 0)
{NULL, NULL, NULL}
};
@@ -2457,6 +2459,20 @@
SOAP_CLIENT_END_CODE();
}
+static void verify_soap_headers_array(HashTable *ht)
+{
+ zval **tmp;
+
+ zend_hash_internal_pointer_reset(ht);
+ while (zend_hash_get_current_data(ht, (void**)tmp) == SUCCESS) {
+ if (Z_TYPE_PP(tmp) != IS_OBJECT ||
+ Z_OBJCE_PP(tmp) != soap_header_class_entry) {
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, Invalid SOAP
header);
+ }
+ zend_hash_move_forward(ht);
+ }
+}
+
/* {{{ proto mixed SoapClient::__call ( string function_name [, array
arguments [, array options [, array input_headers [, array output_headers)
Calls a SOAP function */
@@ -2472,6 +2488,8 @@
zval **real_args = NULL;
zval **param;
int arg_count;
+ zval **tmp;
+ zend_bool free_soap_headers;
HashPosition pos;
@@ -2483,8 +2501,6 @@
if (options) {
if (Z_TYPE_P(options) == IS_ARRAY) {
HashTable *ht = Z_ARRVAL_P(options);
- zval **tmp;
-
if (zend_hash_find(ht, location, sizeof(location),
(void**)tmp) == SUCCESS
Z_TYPE_PP(tmp) == IS_STRING) {
location = Z_STRVAL_PP(tmp);
@@ -2506,27 +2522,43 @@
if (headers == NULL || Z_TYPE_P(headers) == IS_NULL) {
} else if (Z_TYPE_P(headers) == IS_ARRAY) {
- zval** tmp;
-
soap_headers = Z_ARRVAL_P(headers);
- zend_hash_internal_pointer_reset(soap_headers);
- while (zend_hash_get_current_data(soap_headers, (void**)tmp)
== SUCCESS) {
- if (Z_TYPE_PP(tmp) != IS_OBJECT ||
- Z_OBJCE_PP(tmp) != soap_header_class_entry) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR,
Invalid SOAP header);
- }
- zend_hash_move_forward(soap_headers);
- }
+ verify_soap_headers_array(soap_headers);
+ free_soap_headers = 0;
} else if (Z_TYPE_P(headers) == IS_OBJECT
Z_OBJCE_P(headers) == soap_header_class_entry) {
- soap_headers = emalloc(sizeof(HashTable));
- zend_hash_init(soap_headers, 0, NULL, NULL/*ZVAL_PTR_DTOR*/, 0);
+ soap_headers = emalloc(sizeof(HashTable));
+ zend_hash_init(soap_headers, 0, NULL, ZVAL_PTR_DTOR, 0);
zend_hash_next_index_insert(soap_headers, headers,
sizeof(zval*), NULL);
- headers = NULL;
+ ZVAL_ADDREF(headers);
+ free_soap_headers = 1;
} else{
php_error_docref(NULL TSRMLS_CC, E_ERROR, Invalid SOAP
header);
}
+ /* Add default headers */
+ if (zend_hash_find(Z_OBJPROP_P(this_ptr), __default_headers,
sizeof(__default_headers), (void **) tmp)==SUCCESS) {
+ HashTable *default_headers = Z_ARRVAL_P(*tmp);
+ if (soap_headers) {
+ if (!free_soap_headers) {
+ HashTable *tmp = emalloc(sizeof(HashTable));
+ zend_hash_init(tmp, 0, NULL, ZVAL_PTR_DTOR, 0);
+ zend_hash_copy(tmp, soap_headers,
(copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+ soap_headers = tmp;
+ free_soap_headers = 1;
+ }
+ zend_hash_internal_pointer_reset(default_headers);
+ while (zend_hash_get_current_data(default_headers,
(void**)tmp) ==
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS configure.in /main php_version.h
zeevTue Aug 16 06:59:57 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcNEWS configure.in /php-src/main php_version.h Log: Roll RC1 http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.15r2=1.2027.2.16ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.15 php-src/NEWS:1.2027.2.16 --- php-src/NEWS:1.2027.2.15Mon Aug 15 13:14:35 2005 +++ php-src/NEWSTue Aug 16 06:59:42 2005 @@ -1,6 +1,6 @@ PHPNEWS ||| -?? Aug 2005, PHP 5.1 Release Candidate 1 +16 Aug 2005, PHP 5.1 Release Candidate 1 - Removed XML_RPC pear package from distribution and made ext/xmlrpc mandatory for pear. (Rasmus) - Updated bundled libraries in Windows distribution. (Edin) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.579.2.3r2=1.579.2.4ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.3 php-src/configure.in:1.579.2.4 --- php-src/configure.in:1.579.2.3 Thu Aug 11 12:43:24 2005 +++ php-src/configure.inTue Aug 16 06:59:51 2005 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.579.2.3 2005/08/11 16:43:24 rasmus Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.579.2.4 2005/08/16 10:59:51 zeev Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -42,7 +42,7 @@ MAJOR_VERSION=5 MINOR_VERSION=1 RELEASE_VERSION=0 -EXTRA_VERSION=-dev +EXTRA_VERSION=RC1 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.112.2.2r2=1.112.2.3ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.112.2.2 php-src/main/php_version.h:1.112.2.3 --- php-src/main/php_version.h:1.112.2.2Tue Aug 9 01:40:56 2005 +++ php-src/main/php_version.h Tue Aug 16 06:59:56 2005 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 1 #define PHP_RELEASE_VERSION 0 -#define PHP_EXTRA_VERSION -dev -#define PHP_VERSION 5.1.0-dev +#define PHP_EXTRA_VERSION RC1 +#define PHP_VERSION 5.1.0RC1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS configure.in /main php_version.h
zeevTue Aug 16 08:01:42 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcNEWS configure.in /php-src/main php_version.h Log: Go back to dev http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.16r2=1.2027.2.17ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.16 php-src/NEWS:1.2027.2.17 --- php-src/NEWS:1.2027.2.16Tue Aug 16 06:59:42 2005 +++ php-src/NEWSTue Aug 16 08:01:40 2005 @@ -1,6 +1,6 @@ PHPNEWS ||| -16 Aug 2005, PHP 5.1 Release Candidate 1 +?? Aug 2005, PHP 5.1 Release Candidate 2 - Removed XML_RPC pear package from distribution and made ext/xmlrpc mandatory for pear. (Rasmus) - Updated bundled libraries in Windows distribution. (Edin) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.579.2.4r2=1.579.2.5ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.4 php-src/configure.in:1.579.2.5 --- php-src/configure.in:1.579.2.4 Tue Aug 16 06:59:51 2005 +++ php-src/configure.inTue Aug 16 08:01:40 2005 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.579.2.4 2005/08/16 10:59:51 zeev Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.579.2.5 2005/08/16 12:01:40 zeev Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -42,7 +42,7 @@ MAJOR_VERSION=5 MINOR_VERSION=1 RELEASE_VERSION=0 -EXTRA_VERSION=RC1 +EXTRA_VERSION=-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.112.2.3r2=1.112.2.4ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.112.2.3 php-src/main/php_version.h:1.112.2.4 --- php-src/main/php_version.h:1.112.2.3Tue Aug 16 06:59:56 2005 +++ php-src/main/php_version.h Tue Aug 16 08:01:42 2005 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 1 #define PHP_RELEASE_VERSION 0 -#define PHP_EXTRA_VERSION RC1 -#define PHP_VERSION 5.1.0RC1 +#define PHP_EXTRA_VERSION -dev +#define PHP_VERSION 5.1.0-dev -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/spl php_spl.c
At 05:20 02/08/2005, Marcus Boerger wrote: helly Mon Aug 1 22:20:04 2005 EDT Modified files: /php-src/ext/splphp_spl.c Log: - Need to expose this one too http://cvs.php.net/diff.php/php-src/ext/spl/php_spl.c?r1=1.50r2=1.51ty=u Index: php-src/ext/spl/php_spl.c diff -u php-src/ext/spl/php_spl.c:1.50 php-src/ext/spl/php_spl.c:1.51 --- php-src/ext/spl/php_spl.c:1.50 Thu Jul 28 16:59:44 2005 +++ php-src/ext/spl/php_spl.c Mon Aug 1 22:20:01 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_spl.c,v 1.50 2005/07/28 20:59:44 helly Exp $ */ +/* $Id: php_spl.c,v 1.51 2005/08/02 02:20:01 helly Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -153,6 +153,7 @@ SPL_ADD_CLASS(ArrayObject, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(ArrayIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(BadFunctionCallException, z_list, sub, allow, ce_flags); \ + SPL_ADD_CLASS(BadMethodCallException, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(CachingIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(CachingRecursiveIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(Countable, z_list, sub, allow, ce_flags); \ Speaking of coding standards, is there any particular reason we don't prefix the SPL classes with Spl? We're quickly 'polluting' our class namespace with more and more classes. Zeev -- 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
zeevSat Jun 4 12:16:54 2005 EDT
Modified files:
/php-src/main main.c
Log:
__halt_compiler() patch interface
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.627r2=1.628ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.627 php-src/main/main.c:1.628
--- php-src/main/main.c:1.627 Mon May 16 04:37:08 2005
+++ php-src/main/main.c Sat Jun 4 12:16:53 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.627 2005/05/16 08:37:08 tony2001 Exp $ */
+/* $Id: main.c,v 1.628 2005/06/04 16:16:53 zeev Exp $ */
/* {{{ includes
*/
@@ -840,6 +840,11 @@
php_stream_close((php_stream*)handle);
}
+static long stream_fteller_for_zend(void *handle TSRMLS_DC)
+{
+ return (long)php_stream_tell((php_stream*)handle);
+}
+
static int php_stream_open_for_zend(const char *filename, zend_file_handle
*handle TSRMLS_DC)
{
php_stream *stream;
@@ -853,6 +858,7 @@
handle-handle.stream.handle = stream;
handle-handle.stream.reader =
(zend_stream_reader_t)_php_stream_read;
handle-handle.stream.closer = stream_closer_for_zend;
+ handle-handle.stream.fteller = stream_fteller_for_zend;
handle-handle.stream.interactive = 0;
return SUCCESS;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/sqlite/libsqlite/src sqlite.w32.h
zeevMon May 9 12:01:12 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/ext/sqlite/libsqlite/src sqlite.w32.h Log: Fix build http://cvs.php.net/diff.php/php-src/ext/sqlite/libsqlite/src/sqlite.w32.h?r1=1.5r2=1.5.2.1ty=u Index: php-src/ext/sqlite/libsqlite/src/sqlite.w32.h diff -u php-src/ext/sqlite/libsqlite/src/sqlite.w32.h:1.5 php-src/ext/sqlite/libsqlite/src/sqlite.w32.h:1.5.2.1 --- php-src/ext/sqlite/libsqlite/src/sqlite.w32.h:1.5 Fri Jan 16 18:48:39 2004 +++ php-src/ext/sqlite/libsqlite/src/sqlite.w32.h Mon May 9 12:01:12 2005 @@ -12,7 +12,7 @@ ** This header file defines the interface that the SQLite library ** presents to client programs. ** -** @(#) $Id: sqlite.w32.h,v 1.5 2004/01/16 23:48:39 wez Exp $ +** @(#) $Id: sqlite.w32.h,v 1.5.2.1 2005/05/09 16:01:12 zeev Exp $ */ #ifndef _SQLITE_H_ #define _SQLITE_H_ @@ -167,6 +167,7 @@ #define SQLITE_AUTH23 /* Authorization denied */ #define SQLITE_FORMAT 24 /* Auxiliary database format error */ #define SQLITE_RANGE 25 /* 2nd parameter to sqlite_bind out of range */ +#define SQLITE_NOTADB 26 /* File opened that is not a database file */ #define SQLITE_ROW 100 /* sqlite_step() has another row ready */ #define SQLITE_DONE101 /* sqlite_step() has finished executing */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS configure.in /main php_version.h
zeevWed Mar 30 16:43:13 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS configure.in /php-src/main php_version.h Log: Roll 5.0.4 http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.302r2=1.1760.2.303ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.302 php-src/NEWS:1.1760.2.303 --- php-src/NEWS:1.1760.2.302 Tue Mar 29 12:32:37 2005 +++ php-src/NEWSWed Mar 30 16:43:12 2005 @@ -1,6 +1,6 @@ PHPNEWS ||| -24 Mar 2005, PHP 5.0.4RC2 +31 Mar 2005, PHP 5.0.4 - Added SNMPv2 support. (harrie) - Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony) - Added length and charsetnr for field array and object in mysqli. (Georg) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.514.2.45r2=1.514.2.46ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.514.2.45 php-src/configure.in:1.514.2.46 --- php-src/configure.in:1.514.2.45 Sat Mar 26 14:17:10 2005 +++ php-src/configure.inWed Mar 30 16:43:12 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.514.2.45 2005/03/26 19:17:10 derick Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.514.2.46 2005/03/30 21:43:12 zeev 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=4 -EXTRA_VERSION=RC2-dev +EXTRA_VERSION= 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.97.2.21r2=1.97.2.22ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.97.2.21 php-src/main/php_version.h:1.97.2.22 --- php-src/main/php_version.h:1.97.2.21Sat Mar 26 14:17:11 2005 +++ php-src/main/php_version.h Wed Mar 30 16:43:12 2005 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 0 #define PHP_RELEASE_VERSION 4 -#define PHP_EXTRA_VERSION RC2-dev -#define PHP_VERSION 5.0.4RC2-dev +#define PHP_EXTRA_VERSION +#define PHP_VERSION 5.0.4 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS configure.in /main php_version.h
zeevThu Mar 24 03:23:37 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS configure.in /php-src/main php_version.h Log: Roll RC2 http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.300r2=1.1760.2.301ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.300 php-src/NEWS:1.1760.2.301 --- php-src/NEWS:1.1760.2.300 Wed Mar 23 18:56:36 2005 +++ php-src/NEWSThu Mar 24 03:23:34 2005 @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 2005, PHP 5.0.4 +24 Mar 2005, PHP 5.0.4RC2 - Added SNMPv2 support. (harrie) - Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony) - Added length and charsetnr for field array and object in mysqli. (Georg) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.514.2.43r2=1.514.2.44ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.514.2.43 php-src/configure.in:1.514.2.44 --- php-src/configure.in:1.514.2.43 Thu Mar 17 08:11:36 2005 +++ php-src/configure.inThu Mar 24 03:23:34 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.514.2.43 2005/03/17 13:11:36 zeev Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.514.2.44 2005/03/24 08:23:34 zeev 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=4 -EXTRA_VERSION=RC2-dev +EXTRA_VERSION=RC2 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.97.2.19r2=1.97.2.20ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.97.2.19 php-src/main/php_version.h:1.97.2.20 --- php-src/main/php_version.h:1.97.2.19Thu Mar 17 08:11:38 2005 +++ php-src/main/php_version.h Thu Mar 24 03:23:37 2005 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 0 #define PHP_RELEASE_VERSION 4 -#define PHP_EXTRA_VERSION RC2-dev -#define PHP_VERSION 5.0.4RC2-dev +#define PHP_EXTRA_VERSION RC2 +#define PHP_VERSION 5.0.4RC2 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS configure.in /main php_version.h
zeevThu Mar 17 08:11:38 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS configure.in /php-src/main php_version.h Log: RC1 - RC2-dev http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.290r2=1.1760.2.291ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.290 php-src/NEWS:1.1760.2.291 --- php-src/NEWS:1.1760.2.290 Wed Mar 16 15:31:00 2005 +++ php-src/NEWSThu Mar 17 08:11:33 2005 @@ -1,6 +1,6 @@ PHPNEWS ||| -13 Mar 2005, PHP 5.0.4RC1 +?? ??? 2005, PHP 5.0.4 - Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony) - Added length and charsetnr for field array and object in mysqli. (Georg) - Added checks for negative values to gmp_sqrt(), gmp_powm(), gmp_sqrtrem() http://cvs.php.net/diff.php/php-src/configure.in?r1=1.514.2.42r2=1.514.2.43ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.514.2.42 php-src/configure.in:1.514.2.43 --- php-src/configure.in:1.514.2.42 Thu Mar 17 03:12:14 2005 +++ php-src/configure.inThu Mar 17 08:11:36 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.514.2.42 2005/03/17 08:12:14 sniper Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.514.2.43 2005/03/17 13:11:36 zeev 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=4 -EXTRA_VERSION=RC1 +EXTRA_VERSION=RC2-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.97.2.18r2=1.97.2.19ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.97.2.18 php-src/main/php_version.h:1.97.2.19 --- php-src/main/php_version.h:1.97.2.18Sun Mar 13 14:57:05 2005 +++ php-src/main/php_version.h Thu Mar 17 08:11:38 2005 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 0 #define PHP_RELEASE_VERSION 4 -#define PHP_EXTRA_VERSION RC1 -#define PHP_VERSION 5.0.4RC1 +#define PHP_EXTRA_VERSION RC2-dev +#define PHP_VERSION 5.0.4RC2-dev -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
zeevFri Mar 18 02:27:01 2005 EDT Modified files: /CVSROOTavail Log: PostgreSQL karma for Chrisopher http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.954r2=1.955ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.954 CVSROOT/avail:1.955 --- CVSROOT/avail:1.954 Mon Mar 14 15:14:49 2005 +++ CVSROOT/avail Fri Mar 18 02:27:00 2005 @@ -169,7 +169,7 @@ avail|nmav|php-src/ext/ovrimos avail|steinm,uw|php-src/ext/pdf avail|jdonagher,david|php-src/ext/pfpro -avail|jah|php-src/ext/pgsql +avail|jah,chriskl|php-src/ext/pgsql avail|ostborn|php-src/ext/phpdoc,pecl/phpdoc,pecl/soap,pear/Image_GIS avail|clay|pear/VersionControl avail|mfonda|pear/Crypt_HMAC -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS
zeevMon Mar 14 03:57:47 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS Log: RC1 http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.285r2=1.1760.2.286ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.285 php-src/NEWS:1.1760.2.286 --- php-src/NEWS:1.1760.2.285 Sun Mar 13 08:26:10 2005 +++ php-src/NEWSMon Mar 14 03:57:43 2005 @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 2005, PHP 5.0.4 +13 Mar 2005, PHP 5.0.4RC1 - Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony) - Added length and charsetnr for field array and object in mysqli. (Georg) - Added checks for negative values to gmp_sqrt(), gmp_powm(), gmp_sqrtrem() -- 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) /win32 registry.c
zeevMon Mar 14 07:41:19 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/win32 registry.c
Log:
Fix an age old bug in parsing paths when reading
INI values from the registry
http://cvs.php.net/diff.php/php-src/win32/registry.c?r1=1.12.2.1r2=1.12.2.2ty=u
Index: php-src/win32/registry.c
diff -u php-src/win32/registry.c:1.12.2.1 php-src/win32/registry.c:1.12.2.2
--- php-src/win32/registry.c:1.12.2.1 Tue Mar 16 13:27:55 2004
+++ php-src/win32/registry.cMon Mar 14 07:41:18 2005
@@ -38,6 +38,9 @@
drive_letter = tmp_buf[0];
cwd++;
}
+ while (*cwd == '\\' || *cwd == '/') {
+ cwd++;
+ }
path = (char *)
emalloc(2+strlen(cwd)+1+strlen(orig_path)+1);
sprintf(path, %c\\%s\\%s, drive_letter, cwd,
orig_path);
efree(orig_path);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32 registry.c
zeevMon Mar 14 07:42:05 2005 EDT
Modified files:
/php-src/win32 registry.c
Log:
Merge registry fix
http://cvs.php.net/diff.php/php-src/win32/registry.c?r1=1.15r2=1.16ty=u
Index: php-src/win32/registry.c
diff -u php-src/win32/registry.c:1.15 php-src/win32/registry.c:1.16
--- php-src/win32/registry.c:1.15 Sun Oct 19 09:47:35 2003
+++ php-src/win32/registry.cMon Mar 14 07:42:05 2005
@@ -38,6 +38,9 @@
drive_letter = tmp_buf[0];
cwd++;
}
+ while (*cwd == '\\' || *cwd == '/') {
+ cwd++;
+ }
path = (char *)
emalloc(2+strlen(cwd)+1+strlen(orig_path)+1);
sprintf(path, %c\\%s\\%s, drive_letter, cwd,
orig_path);
efree(orig_path);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /win32 registry.c
zeevMon Mar 14 07:42:56 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/win32 registry.c
Log:
MFH
http://cvs.php.net/diff.php/php-src/win32/registry.c?r1=1.15r2=1.15.2.1ty=u
Index: php-src/win32/registry.c
diff -u php-src/win32/registry.c:1.15 php-src/win32/registry.c:1.15.2.1
--- php-src/win32/registry.c:1.15 Sun Oct 19 09:47:35 2003
+++ php-src/win32/registry.cMon Mar 14 07:42:55 2005
@@ -38,6 +38,9 @@
drive_letter = tmp_buf[0];
cwd++;
}
+ while (*cwd == '\\' || *cwd == '/') {
+ cwd++;
+ }
path = (char *)
emalloc(2+strlen(cwd)+1+strlen(orig_path)+1);
sprintf(path, %c\\%s\\%s, drive_letter, cwd,
orig_path);
efree(orig_path);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / configure.in /main php_version.h
zeevSun Mar 13 14:57:06 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcconfigure.in /php-src/main php_version.h Log: Prepare to roll 5.0.4RC1 http://cvs.php.net/diff.php/php-src/configure.in?r1=1.514.2.37r2=1.514.2.38ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.514.2.37 php-src/configure.in:1.514.2.38 --- php-src/configure.in:1.514.2.37 Fri Mar 11 05:57:08 2005 +++ php-src/configure.inSun Mar 13 14:57:04 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.514.2.37 2005/03/11 10:57:08 hyanantha Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.514.2.38 2005/03/13 19:57:04 zeev 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=4 -EXTRA_VERSION=-dev +EXTRA_VERSION=RC1 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.97.2.17r2=1.97.2.18ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.97.2.17 php-src/main/php_version.h:1.97.2.18 --- php-src/main/php_version.h:1.97.2.17Wed Dec 15 02:02:05 2004 +++ php-src/main/php_version.h Sun Mar 13 14:57:05 2005 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 0 #define PHP_RELEASE_VERSION 4 -#define PHP_EXTRA_VERSION -dev -#define PHP_VERSION 5.0.4-dev +#define PHP_EXTRA_VERSION RC1 +#define PHP_VERSION 5.0.4RC1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard basic_functions.c
zeevThu Mar 10 09:32:17 2005 EDT
Modified files:
/php-src/ext/standard basic_functions.c
Log:
Fix prototype
http://cvs.php.net/diff.php/php-src/ext/standard/basic_functions.c?r1=1.705r2=1.706ty=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.705
php-src/ext/standard/basic_functions.c:1.706
--- php-src/ext/standard/basic_functions.c:1.705Mon Mar 7 14:37:26 2005
+++ php-src/ext/standard/basic_functions.c Thu Mar 10 09:32:16 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.705 2005/03/07 19:37:26 iliaa Exp $ */
+/* $Id: basic_functions.c,v 1.706 2005/03/10 14:32:16 zeev Exp $ */
#include php.h
#include php_streams.h
@@ -2751,7 +2751,7 @@
/* }}} */
-/* {{{ proto mixed print_r(mixed var [, bool return])
+/* {{{ proto bool print_r(mixed var [, bool return])
Prints out or returns information about the specified variable */
PHP_FUNCTION(print_r)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard basic_functions.c
zeevThu Mar 10 09:33:54 2005 EDT
Modified files:
/php-src/ext/standard basic_functions.c
Log:
Oops, revert.
http://cvs.php.net/diff.php/php-src/ext/standard/basic_functions.c?r1=1.706r2=1.707ty=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.706
php-src/ext/standard/basic_functions.c:1.707
--- php-src/ext/standard/basic_functions.c:1.706Thu Mar 10 09:32:16 2005
+++ php-src/ext/standard/basic_functions.c Thu Mar 10 09:33:53 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.706 2005/03/10 14:32:16 zeev Exp $ */
+/* $Id: basic_functions.c,v 1.707 2005/03/10 14:33:53 zeev Exp $ */
#include php.h
#include php_streams.h
@@ -2751,7 +2751,7 @@
/* }}} */
-/* {{{ proto bool print_r(mixed var [, bool return])
+/* {{{ proto mixed print_r(mixed var [, bool return])
Prints out or returns information about the specified variable */
PHP_FUNCTION(print_r)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap EXPERIMENTAL
zeevWed Feb 2 12:22:19 2005 EDT Removed files: /php-src/ext/soap EXPERIMENTAL Log: Removing this file has been long due... API's and functionality are stable. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/soap EXPERIMENTAL
zeevWed Feb 2 12:24:02 2005 EDT Removed files: (Branch: PHP_5_0) /php-src/ext/soap EXPERIMENTAL Log: MFH -- 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 basic_functions.c
zeevTue Dec 28 04:01:49 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard basic_functions.c
Log:
Update desc
http://cvs.php.net/diff.php/php-src/ext/standard/basic_functions.c?r1=1.543.2.43r2=1.543.2.44ty=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.543.2.43
php-src/ext/standard/basic_functions.c:1.543.2.44
--- php-src/ext/standard/basic_functions.c:1.543.2.43 Mon Dec 20 14:15:24 2004
+++ php-src/ext/standard/basic_functions.c Tue Dec 28 04:01:48 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.543.2.43 2004/12/20 19:15:24 sniper Exp $ */
+/* $Id: basic_functions.c,v 1.543.2.44 2004/12/28 09:01:48 zeev Exp $ */
#include php.h
#include php_streams.h
@@ -2473,7 +2473,7 @@
}
/* }}} */
-/* {{{ proto string set_include_path(string varname, string newvalue)
+/* {{{ proto string set_include_path(string new_include_path)
Sets the include_path configuration option */
PHP_FUNCTION(set_include_path)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard basic_functions.c
zeevMon Dec 27 13:21:56 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/standard basic_functions.c
Log:
Fix description
http://cvs.php.net/diff.php/php-src/ext/standard/basic_functions.c?r1=1.673.2.7r2=1.673.2.8ty=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.673.2.7
php-src/ext/standard/basic_functions.c:1.673.2.8
--- php-src/ext/standard/basic_functions.c:1.673.2.7Mon Nov 15 18:16:20 2004
+++ php-src/ext/standard/basic_functions.c Mon Dec 27 13:21:55 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.673.2.7 2004/11/15 23:16:20 fmk Exp $ */
+/* $Id: basic_functions.c,v 1.673.2.8 2004/12/27 18:21:55 zeev Exp $ */
#include php.h
#include php_streams.h
@@ -2584,7 +2584,7 @@
}
/* }}} */
-/* {{{ proto string set_include_path(string varname, string newvalue)
+/* {{{ proto string set_include_path(string new_include_path)
Sets the include_path configuration option */
PHP_FUNCTION(set_include_path)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard basic_functions.c
zeevMon Dec 27 13:22:50 2004 EDT
Modified files:
/php-src/ext/standard basic_functions.c
Log:
MFB - description fix
http://cvs.php.net/diff.php/php-src/ext/standard/basic_functions.c?r1=1.699r2=1.700ty=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.699
php-src/ext/standard/basic_functions.c:1.700
--- php-src/ext/standard/basic_functions.c:1.699Sun Dec 12 11:10:34 2004
+++ php-src/ext/standard/basic_functions.c Mon Dec 27 13:22:50 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.699 2004/12/12 16:10:34 wez Exp $ */
+/* $Id: basic_functions.c,v 1.700 2004/12/27 18:22:50 zeev Exp $ */
#include php.h
#include php_streams.h
@@ -2678,7 +2678,7 @@
}
/* }}} */
-/* {{{ proto string set_include_path(string varname, string newvalue)
+/* {{{ proto string set_include_path(string new_include_path)
Sets the include_path configuration option */
PHP_FUNCTION(set_include_path)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/com_dotnet com_handlers.c /ext/spl spl_iterators.c /ext/standard incomplete_class.c
zeevThu Nov 25 15:28:38 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/com_dotnet com_handlers.c
/php-src/ext/splspl_iterators.c
/php-src/ext/standard incomplete_class.c
Log:
Reverting get_method() signature change
@ Guys - I did my best to look for all of the changed places,
@ but I may have missed something. If you remember other places
@ which were changed that I haven't reverted, please fix or let me know.
@ Also - Marcus, please take a look at SPL - as this particular
@ implementation took advantage of the signature change, the way I 'fixed'
@ it may very well be incorrect
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_handlers.c?r1=1.22.2.2r2=1.22.2.3ty=u
Index: php-src/ext/com_dotnet/com_handlers.c
diff -u php-src/ext/com_dotnet/com_handlers.c:1.22.2.2
php-src/ext/com_dotnet/com_handlers.c:1.22.2.3
--- php-src/ext/com_dotnet/com_handlers.c:1.22.2.2 Sat Nov 20 06:41:24 2004
+++ php-src/ext/com_dotnet/com_handlers.c Thu Nov 25 15:28:37 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_handlers.c,v 1.22.2.2 2004/11/20 11:41:24 rrichards Exp $ */
+/* $Id: com_handlers.c,v 1.22.2.3 2004/11/25 20:28:37 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -293,13 +293,12 @@
INTERNAL_FUNCTION_PARAM_PASSTHRU);
}
-static union _zend_function *com_method_get(zval **object_ptr, char *name, int
len TSRMLS_DC)
+static union _zend_function *com_method_get(zval *object, char *name, int len
TSRMLS_DC)
{
zend_internal_function f, *fptr = NULL;
php_com_dotnet_object *obj;
union _zend_function *func;
DISPID dummy;
- zval *object = *object_ptr;
obj = CDNO_FETCH(object);
http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.38.2.4r2=1.38.2.5ty=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.38.2.4
php-src/ext/spl/spl_iterators.c:1.38.2.5
--- php-src/ext/spl/spl_iterators.c:1.38.2.4Sun Oct 31 10:43:06 2004
+++ php-src/ext/spl/spl_iterators.c Thu Nov 25 15:28:37 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_iterators.c,v 1.38.2.4 2004/10/31 15:43:06 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.38.2.5 2004/11/25 20:28:37 zeev Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -489,19 +489,19 @@
}
#endif
-static union _zend_function *spl_dual_it_get_method(zval **object_ptr, char
*method, int method_len TSRMLS_DC)
+static union _zend_function *spl_dual_it_get_method(zval *object_ptr, char
*method, int method_len TSRMLS_DC)
{
union _zend_function *function_handler;
spl_dual_it_object *intern;
- intern = (spl_dual_it_object*)zend_object_store_get_object(*object_ptr
TSRMLS_CC);
+ intern = (spl_dual_it_object*)zend_object_store_get_object(object_ptr
TSRMLS_CC);
function_handler = std_object_handlers.get_method(object_ptr, method,
method_len TSRMLS_CC);
if (!function_handler) {
if (zend_hash_find(intern-inner.ce-function_table, method,
method_len+1, (void **) function_handler) == FAILURE) {
if (Z_OBJ_HT_P(intern-inner.zobject)-get_method) {
- *object_ptr = intern-inner.zobject;
- function_handler =
Z_OBJ_HT_P(*object_ptr)-get_method(object_ptr, method, method_len TSRMLS_CC);
+ object_ptr = intern-inner.zobject;
+ function_handler =
Z_OBJ_HT_P(object_ptr)-get_method(object_ptr, method, method_len TSRMLS_CC);
}
}
}
http://cvs.php.net/diff.php/php-src/ext/standard/incomplete_class.c?r1=1.24.2.2r2=1.24.2.3ty=u
Index: php-src/ext/standard/incomplete_class.c
diff -u php-src/ext/standard/incomplete_class.c:1.24.2.2
php-src/ext/standard/incomplete_class.c:1.24.2.3
--- php-src/ext/standard/incomplete_class.c:1.24.2.2Sat Oct 30 15:17:21 2004
+++ php-src/ext/standard/incomplete_class.c Thu Nov 25 15:28:37 2004
@@ -17,7 +17,7 @@
*/
-/* $Id: incomplete_class.c,v 1.24.2.2 2004/10/30 19:17:21 helly Exp $ */
+/* $Id: incomplete_class.c,v 1.24.2.3 2004/11/25 20:28:37 zeev Exp $ */
#include php.h
#include basic_functions.h
@@ -82,8 +82,8 @@
return 0;
}
-static union _zend_function *incomplete_class_get_method(zval **object_ptr,
char *method, int method_len TSRMLS_DC) {
- incomplete_class_message(*object_ptr, E_ERROR TSRMLS_CC);
+static union _zend_function *incomplete_class_get_method(zval *object_ptr,
char *method, int method_len TSRMLS_DC) {
+ incomplete_class_message(object_ptr, E_ERROR TSRMLS_CC);
return NULL;
}
--
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
zeevSun Sep 5 18:40:35 2004 EDT
Modified files:
/php-src/main main.c
Log:
Fix reverse dependency
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.608r2=1.609ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.608 php-src/main/main.c:1.609
--- php-src/main/main.c:1.608 Mon Aug 16 08:24:52 2004
+++ php-src/main/main.c Sun Sep 5 18:40:35 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.608 2004/08/16 12:24:52 zeev Exp $ */
+/* $Id: main.c,v 1.609 2004/09/05 22:40:35 zeev Exp $ */
/* {{{ includes
*/
@@ -1339,6 +1339,7 @@
zuf.on_timeout = php_on_timeout;
zuf.stream_open_function = php_stream_open_for_zend;
zuf.vspprintf_function = vspprintf;
+ zuf.getenv_function = sapi_getenv;
zend_startup(zuf, NULL, 1);
#ifdef ZTS
--
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) /main main.c
zeevMon Aug 16 08:23:06 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/main main.c
Log:
Fix an OLDIE fd leak
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.512.2.54r2=1.512.2.55ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.512.2.54 php-src/main/main.c:1.512.2.55
--- php-src/main/main.c:1.512.2.54 Wed Jul 21 12:25:28 2004
+++ php-src/main/main.c Mon Aug 16 08:23:06 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.512.2.54 2004/07/21 16:25:28 sesser Exp $ */
+/* $Id: main.c,v 1.512.2.55 2004/08/16 12:23:06 zeev Exp $ */
/* {{{ includes
*/
@@ -1668,6 +1668,7 @@
EG(exit_status) = 0;
if (php_handle_special_queries(TSRMLS_C)) {
+ zend_file_handle_dtor(primary_file);
return 0;
}
#ifndef HAVE_BROKEN_GETCWD
--
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
zeevMon Aug 16 08:24:52 2004 EDT
Modified files:
/php-src/main main.c
Log:
Fix an oldie fd leak
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.607r2=1.608ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.607 php-src/main/main.c:1.608
--- php-src/main/main.c:1.607 Fri Aug 13 03:02:50 2004
+++ php-src/main/main.c Mon Aug 16 08:24:52 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.607 2004/08/13 07:02:50 derick Exp $ */
+/* $Id: main.c,v 1.608 2004/08/16 12:24:52 zeev Exp $ */
/* {{{ includes
*/
@@ -1566,6 +1566,7 @@
EG(exit_status) = 0;
if (php_handle_special_queries(TSRMLS_C)) {
+ zend_file_handle_dtor(primary_file);
return 0;
}
#ifndef HAVE_BROKEN_GETCWD
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /main main.c
zeevMon Aug 16 08:25:40 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/main main.c
Log:
MFH
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.604.2.1r2=1.604.2.2ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.604.2.1 php-src/main/main.c:1.604.2.2
--- php-src/main/main.c:1.604.2.1 Fri Aug 13 03:08:46 2004
+++ php-src/main/main.c Mon Aug 16 08:25:40 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.604.2.1 2004/08/13 07:08:46 derick Exp $ */
+/* $Id: main.c,v 1.604.2.2 2004/08/16 12:25:40 zeev Exp $ */
/* {{{ includes
*/
@@ -1562,6 +1562,7 @@
EG(exit_status) = 0;
if (php_handle_special_queries(TSRMLS_C)) {
+ zend_file_handle_dtor(primary_file);
return 0;
}
#ifndef HAVE_BROKEN_GETCWD
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS
zeevMon Aug 16 08:34:21 2004 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS Log: http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.43r2=1.1760.2.44ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.43 php-src/NEWS:1.1760.2.44 --- php-src/NEWS:1.1760.2.43Mon Aug 16 04:51:12 2004 +++ php-src/NEWSMon Aug 16 08:34:20 2004 @@ -1,6 +1,7 @@ PHPNEWS ||| ?? ??? 2004, PHP 5.0.2 +- Fixed a file-descriptor leak with phpinfo() and other 'special' URLs (Zeev) - Added PHP_EOL constant that contains the OS way of representing newlines. (Paul Hudson, Derick) - Fixed bug #29678 (opendir() with ftp:// wrapper segfaults if path does not -- 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
zeevMon Aug 16 08:34:47 2004 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.715r2=1.1247.2.716ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.715 php-src/NEWS:1.1247.2.716 --- php-src/NEWS:1.1247.2.715 Fri Aug 13 07:38:48 2004 +++ php-src/NEWSMon Aug 16 08:34:46 2004 @@ -1,6 +1,7 @@ PHP 4 NEWS ||| ?? ??? 2004, Version 4.3.9 +- Fixed a file-descriptor leak with phpinfo() and other 'special' URLs (Zeev) - Fixed bug #29599 (domxml_error segfaults another apache module). (Rob) 11 Aug 2004, Version 4.3.9RC1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/simplexml simplexml.c
zeevWed Aug 4 10:40:53 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/simplexml simplexml.c
Log:
Fix prototypes
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.139r2=1.139.2.1ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.139
php-src/ext/simplexml/simplexml.c:1.139.2.1
--- php-src/ext/simplexml/simplexml.c:1.139 Tue May 4 11:03:48 2004
+++ php-src/ext/simplexml/simplexml.c Wed Aug 4 10:40:53 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.139 2004/05/04 15:03:48 wez Exp $ */
+/* $Id: simplexml.c,v 1.139.2.1 2004/08/04 14:40:53 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -764,8 +764,8 @@
}
/* }}} */
-/* {{{ xpath()
- */
+/* {{{ array SimpleXMLElement::xpath(string path)
+ Runs XPath query on the XML data */
SXE_METHOD(xpath)
{
php_sxe_object*sxe;
@@ -845,8 +845,8 @@
}
/* }}} */
-/* {{{ proto asXML([string filename])
- */
+/* {{{ proto string SimpleXMLElement::asXML([string filename])
+ Return a well-formed XML string based on SimpleXML element */
SXE_METHOD(asXML)
{
php_sxe_object *sxe;
@@ -918,8 +918,8 @@
}
/* }}} */
-/* {{{ simplexml_children()
- */
+/* {{{ proto object SimpleXMLElement::children()
+ Finds children of given node */
SXE_METHOD(children)
{
php_sxe_object *sxe;
@@ -940,8 +940,8 @@
}
/* }}} */
-/* {{{ simplexml_attributes()
- */
+/* {{{ proto array SimpleXMLElement::attributes([string ns])
+ Identifies an element's attributes */
SXE_METHOD(attributes)
{
php_sxe_object *sxe;
@@ -1280,6 +1280,9 @@
}
/* }}} */
+
+/* {{{ proto SimpleXMLElement::__construct()
+ SimpleXMLElement constructor */
SXE_METHOD(__construct)
{
php_sxe_object *sxe = php_sxe_fetch_object(getThis() TSRMLS_CC);
@@ -1304,6 +1307,8 @@
php_libxml_increment_doc_ref((php_libxml_node_object *)sxe, docp TSRMLS_CC);
php_libxml_increment_node_ptr((php_libxml_node_object *)sxe,
xmlDocGetRootElement(docp), NULL TSRMLS_CC);
}
+/* }}} */
+
typedef struct {
zend_object_iterator intern;
@@ -1651,7 +1656,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.139 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.139.2.1 $);
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
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
zeevWed Aug 4 10:41:56 2004 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
Fix prototypes
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.141r2=1.142ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.141 php-src/ext/simplexml/simplexml.c:1.142
--- php-src/ext/simplexml/simplexml.c:1.141 Sun Jul 25 10:59:21 2004
+++ php-src/ext/simplexml/simplexml.c Wed Aug 4 10:41:56 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.141 2004/07/25 14:59:21 chregu Exp $ */
+/* $Id: simplexml.c,v 1.142 2004/08/04 14:41:56 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -764,8 +764,8 @@
}
/* }}} */
-/* {{{ xpath()
- */
+/* {{{ array SimpleXMLElement::xpath(string path)
+ Runs XPath query on the XML data */
SXE_METHOD(xpath)
{
php_sxe_object*sxe;
@@ -868,8 +868,8 @@
/* }}} */
-/* {{{ proto asXML([string filename])
- */
+/* {{{ proto string SimpleXMLElement::asXML([string filename])
+ Return a well-formed XML string based on SimpleXML element */
SXE_METHOD(asXML)
{
php_sxe_object *sxe;
@@ -941,8 +941,8 @@
}
/* }}} */
-/* {{{ simplexml_children()
- */
+/* {{{ proto object SimpleXMLElement::children()
+ Finds children of given node */
SXE_METHOD(children)
{
php_sxe_object *sxe;
@@ -963,8 +963,8 @@
}
/* }}} */
-/* {{{ simplexml_attributes()
- */
+/* {{{ proto array SimpleXMLElement::attributes([string ns])
+ Identifies an element's attributes */
SXE_METHOD(attributes)
{
php_sxe_object *sxe;
@@ -1303,6 +1303,9 @@
}
/* }}} */
+
+/* {{{ proto SimpleXMLElement::__construct()
+ SimpleXMLElement constructor */
SXE_METHOD(__construct)
{
php_sxe_object *sxe = php_sxe_fetch_object(getThis() TSRMLS_CC);
@@ -1327,6 +1330,8 @@
php_libxml_increment_doc_ref((php_libxml_node_object *)sxe, docp TSRMLS_CC);
php_libxml_increment_node_ptr((php_libxml_node_object *)sxe,
xmlDocGetRootElement(docp), NULL TSRMLS_CC);
}
+/* }}} */
+
typedef struct {
zend_object_iterator intern;
@@ -1675,7 +1680,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.141 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.142 $);
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
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/tidy tidy.c
zeevWed Aug 4 12:39:57 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/tidy tidy.c
Log:
Fix prototypes
http://cvs.php.net/diff.php/php-src/ext/tidy/tidy.c?r1=1.56r2=1.56.2.1ty=u
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.56 php-src/ext/tidy/tidy.c:1.56.2.1
--- php-src/ext/tidy/tidy.c:1.56Tue Jul 13 22:41:53 2004
+++ php-src/ext/tidy/tidy.c Wed Aug 4 12:39:56 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: tidy.c,v 1.56 2004/07/14 02:41:53 john Exp $ */
+/* $Id: tidy.c,v 1.56.2.1 2004/08/04 16:39:56 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -952,7 +952,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Tidy support, enabled);
php_info_print_table_row(2, libTidy Release, (char *)tidyReleaseDate());
- php_info_print_table_row(2, Extension Version, PHP_TIDY_MODULE_VERSION
($Id: tidy.c,v 1.56 2004/07/14 02:41:53 john Exp $));
+ php_info_print_table_row(2, Extension Version, PHP_TIDY_MODULE_VERSION
($Id: tidy.c,v 1.56.2.1 2004/08/04 16:39:56 zeev Exp $));
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -1472,14 +1472,14 @@
}
/* }}} */
-/* {{{ proto void tidy_node::tidy_node()
+/* {{{ proto tidyNode::tidyNode()
Constructor. */
TIDY_NODE_METHOD(__construct)
{
}
/* }}} */
-/* {{{ proto boolean tidy_node::hasChildren()
+/* {{{ proto boolean tidyNode::hasChildren()
Returns true if this node has children */
TIDY_NODE_METHOD(hasChildren)
{
@@ -1493,7 +1493,7 @@
}
/* }}} */
-/* {{{ proto boolean tidy_node::hasSiblings()
+/* {{{ proto boolean tidyNode::hasSiblings()
Returns true if this node has siblings */
TIDY_NODE_METHOD(hasSiblings)
{
@@ -1507,7 +1507,7 @@
}
/* }}} */
-/* {{{ proto boolean tidy_node::isComment()
+/* {{{ proto boolean tidyNode::isComment()
Returns true if this node represents a comment */
TIDY_NODE_METHOD(isComment)
{
@@ -1521,7 +1521,7 @@
}
/* }}} */
-/* {{{ proto boolean tidy_node::isHtml()
+/* {{{ proto boolean tidyNode::isHtml()
Returns true if this node is part of a HTML document */
TIDY_NODE_METHOD(isHtml)
{
@@ -1535,7 +1535,7 @@
}
/* }}} */
-/* {{{ proto boolean tidy_node::isXhtml()
+/* {{{ proto boolean tidyNode::isXhtml()
Returns true if this node is part of a XHTML document */
TIDY_NODE_METHOD(isXhtml)
{
@@ -1549,7 +1549,7 @@
}
/* }}} */
-/* {{{ proto boolean tidy_node::isXml()
+/* {{{ proto boolean tidyNode::isXml()
Returns true if this node is part of a XML document */
TIDY_NODE_METHOD(isXml)
{
@@ -1563,7 +1563,7 @@
}
/* }}} */
-/* {{{ proto boolean tidy_node::isText()
+/* {{{ proto boolean tidyNode::isText()
Returns true if this node represents text (no markup) */
TIDY_NODE_METHOD(isText)
{
@@ -1577,7 +1577,7 @@
}
/* }}} */
-/* {{{ proto boolean tidy_node::isJste()
+/* {{{ proto boolean tidyNode::isJste()
Returns true if this node is JSTE */
TIDY_NODE_METHOD(isJste)
{
@@ -1591,7 +1591,7 @@
}
/* }}} */
-/* {{{ proto boolean tidy_node::isAsp()
+/* {{{ proto boolean tidyNode::isAsp()
Returns true if this node is ASP */
TIDY_NODE_METHOD(isAsp)
{
@@ -1605,7 +1605,7 @@
}
/* }}} */
-/* {{{ proto boolean tidy_node::isPhp()
+/* {{{ proto boolean tidyNode::isPhp()
Returns true if this node is PHP */
TIDY_NODE_METHOD(isPhp)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/tidy tidy.c
zeevWed Aug 4 12:41:13 2004 EDT
Modified files:
/php-src/ext/tidy tidy.c
Log:
Update prototypes
http://cvs.php.net/diff.php/php-src/ext/tidy/tidy.c?r1=1.56r2=1.57ty=u
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.56 php-src/ext/tidy/tidy.c:1.57
--- php-src/ext/tidy/tidy.c:1.56Tue Jul 13 22:41:53 2004
+++ php-src/ext/tidy/tidy.c Wed Aug 4 12:41:13 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: tidy.c,v 1.56 2004/07/14 02:41:53 john Exp $ */
+/* $Id: tidy.c,v 1.57 2004/08/04 16:41:13 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -952,7 +952,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Tidy support, enabled);
php_info_print_table_row(2, libTidy Release, (char *)tidyReleaseDate());
- php_info_print_table_row(2, Extension Version, PHP_TIDY_MODULE_VERSION
($Id: tidy.c,v 1.56 2004/07/14 02:41:53 john Exp $));
+ php_info_print_table_row(2, Extension Version, PHP_TIDY_MODULE_VERSION
($Id: tidy.c,v 1.57 2004/08/04 16:41:13 zeev Exp $));
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -1472,14 +1472,14 @@
}
/* }}} */
-/* {{{ proto void tidy_node::tidy_node()
+/* {{{ proto tidyNode::tidyNode()
Constructor. */
TIDY_NODE_METHOD(__construct)
{
}
/* }}} */
-/* {{{ proto boolean tidy_node::hasChildren()
+/* {{{ proto boolean tidyNode::hasChildren()
Returns true if this node has children */
TIDY_NODE_METHOD(hasChildren)
{
@@ -1493,7 +1493,7 @@
}
/* }}} */
-/* {{{ proto boolean tidy_node::hasSiblings()
+/* {{{ proto boolean tidyNode::hasSiblings()
Returns true if this node has siblings */
TIDY_NODE_METHOD(hasSiblings)
{
@@ -1507,7 +1507,7 @@
}
/* }}} */
-/* {{{ proto boolean tidy_node::isComment()
+/* {{{ proto boolean tidyNode::isComment()
Returns true if this node represents a comment */
TIDY_NODE_METHOD(isComment)
{
@@ -1521,7 +1521,7 @@
}
/* }}} */
-/* {{{ proto boolean tidy_node::isHtml()
+/* {{{ proto boolean tidyNode::isHtml()
Returns true if this node is part of a HTML document */
TIDY_NODE_METHOD(isHtml)
{
@@ -1535,7 +1535,7 @@
}
/* }}} */
-/* {{{ proto boolean tidy_node::isXhtml()
+/* {{{ proto boolean tidyNode::isXhtml()
Returns true if this node is part of a XHTML document */
TIDY_NODE_METHOD(isXhtml)
{
@@ -1549,7 +1549,7 @@
}
/* }}} */
-/* {{{ proto boolean tidy_node::isXml()
+/* {{{ proto boolean tidyNode::isXml()
Returns true if this node is part of a XML document */
TIDY_NODE_METHOD(isXml)
{
@@ -1563,7 +1563,7 @@
}
/* }}} */
-/* {{{ proto boolean tidy_node::isText()
+/* {{{ proto boolean tidyNode::isText()
Returns true if this node represents text (no markup) */
TIDY_NODE_METHOD(isText)
{
@@ -1577,7 +1577,7 @@
}
/* }}} */
-/* {{{ proto boolean tidy_node::isJste()
+/* {{{ proto boolean tidyNode::isJste()
Returns true if this node is JSTE */
TIDY_NODE_METHOD(isJste)
{
@@ -1591,7 +1591,7 @@
}
/* }}} */
-/* {{{ proto boolean tidy_node::isAsp()
+/* {{{ proto boolean tidyNode::isAsp()
Returns true if this node is ASP */
TIDY_NODE_METHOD(isAsp)
{
@@ -1605,7 +1605,7 @@
}
/* }}} */
-/* {{{ proto boolean tidy_node::isPhp()
+/* {{{ proto boolean tidyNode::isPhp()
Returns true if this node is PHP */
TIDY_NODE_METHOD(isPhp)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32 php5dllts.dsp
zeevThu Jul 22 04:06:52 2004 EDT Modified files: /php-src/win32 php5dllts.dsp Log: Fix Windows build http://cvs.php.net/diff.php/php-src/win32/php5dllts.dsp?r1=1.2r2=1.3ty=u Index: php-src/win32/php5dllts.dsp diff -u php-src/win32/php5dllts.dsp:1.2 php-src/win32/php5dllts.dsp:1.3 --- php-src/win32/php5dllts.dsp:1.2 Mon May 10 08:06:09 2004 +++ php-src/win32/php5dllts.dsp Thu Jul 22 04:06:52 2004 @@ -1520,6 +1520,10 @@ # End Source File # Begin Source File +SOURCE=..\ext\zlib\zlib_filter.c +# End Source File +# Begin Source File + SOURCE=..\ext\zlib\zlib_fopen_wrapper.c # End Source File # End Group -- 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) /main php_ini.c
zeevThu Jul 1 11:43:40 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/main php_ini.c
Log:
MFH (more or less) registry-based setting for the location of php.ini
http://cvs.php.net/diff.php/php-src/main/php_ini.c?r1=1.106.2.13r2=1.106.2.14ty=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.106.2.13 php-src/main/php_ini.c:1.106.2.14
--- php-src/main/php_ini.c:1.106.2.13 Mon Feb 16 09:29:07 2004
+++ php-src/main/php_ini.c Thu Jul 1 11:43:40 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_ini.c,v 1.106.2.13 2004/02/16 14:29:07 derick Exp $ */
+/* $Id: php_ini.c,v 1.106.2.14 2004/07/01 15:43:40 zeev Exp $ */
/* Check CWD for php.ini */
#define INI_CHECK_CWD
@@ -31,6 +31,7 @@
#include SAPI.h
#include php_main.h
#include php_scandir.h
+#include win32/php_registry.h
#if HAVE_SCANDIR HAVE_ALPHASORT HAVE_DIRENT_H
#include dirent.h
@@ -227,11 +228,20 @@
}
/* }}} */
+#ifdef PHP_WIN32
+#define NUM_INI_SEARCH_LOCATIONS 4
+#else
+#define NUM_INI_SEARCH_LOCATIONS 3
+#endif
+
/* {{{ php_init_config
*/
int php_init_config()
{
char *env_location, *php_ini_search_path;
+#ifdef PHP_WIN32
+ char *registry_location;
+#endif
char *binary_location;
int safe_mode_state;
char *open_basedir;
@@ -271,7 +281,7 @@
char *default_location;
static const char paths_separator[] = { ZEND_PATHS_SEPARATOR, 0 };
- php_ini_search_path = (char *) emalloc(MAXPATHLEN * 3 +
strlen(env_location) + 3 + 1);
+ php_ini_search_path = (char *) emalloc(MAXPATHLEN *
NUM_INI_SEARCH_LOCATIONS + strlen(env_location) + NUM_INI_SEARCH_LOCATIONS + 1);
free_ini_search_path = 1;
php_ini_search_path[0] = 0;
@@ -286,6 +296,17 @@
}
strcat(php_ini_search_path, env_location);
}
+
+#ifdef PHP_WIN32
+ registry_location = GetIniPathFromRegistry();
+ if (registry_location) {
+ if (*php_ini_search_path) {
+ strcat(php_ini_search_path, paths_separator);
+ }
+ strcat(php_ini_search_path, registry_location);
+ efree(registry_location);
+ }
+#endif
/* Add cwd */
#ifdef INI_CHECK_CWD
--
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_iterators.c
zeevMon May 31 04:58:32 2004 EDT
Modified files:
/php-src/ext/splspl_iterators.c
Log:
Fix typo
http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.37r2=1.38ty=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.37 php-src/ext/spl/spl_iterators.c:1.38
--- php-src/ext/spl/spl_iterators.c:1.37Sun May 30 13:32:32 2004
+++ php-src/ext/spl/spl_iterators.c Mon May 31 04:58:32 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_iterators.c,v 1.37 2004/05/30 17:32:32 zeev Exp $ */
+/* $Id: spl_iterators.c,v 1.38 2004/05/31 08:58:32 zeev Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -1265,7 +1265,7 @@
{NULL, NULL, NULL}
};
-/* {{{ proto CachingRecursiveIterator::__constrcut(RecursiveIterator $it)
+/* {{{ proto CachingRecursiveIterator::__construct(RecursiveIterator $it)
Create an iterator from a RecursiveIterator */
SPL_METHOD(CachingRecursiveIterator, __construct)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom document.c
zeevMon May 31 08:27:50 2004 EDT
Modified files:
/php-src/ext/domdocument.c
Log:
Fix prototypes
http://cvs.php.net/diff.php/php-src/ext/dom/document.c?r1=1.53r2=1.54ty=u
Index: php-src/ext/dom/document.c
diff -u php-src/ext/dom/document.c:1.53 php-src/ext/dom/document.c:1.54
--- php-src/ext/dom/document.c:1.53 Thu May 27 07:15:44 2004
+++ php-src/ext/dom/document.c Mon May 31 08:27:49 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: document.c,v 1.53 2004/05/27 11:15:44 rrichards Exp $ */
+/* $Id: document.c,v 1.54 2004/05/31 12:27:49 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1544,7 +1544,7 @@
}
/* }}} end dom_parser_document */
-/* {{{ proto boolean domnode dom_document_load(string source);
+/* {{{ proto boolean|domnode dom_document_load(string source);
URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-load
Since: DOM Level 3
*/
@@ -1554,7 +1554,7 @@
}
/* }}} end dom_document_load */
-/* {{{ proto boolean domnode dom_document_loadxml(string source);
+/* {{{ proto boolean|domnode dom_document_loadxml(string source);
URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-loadXML
Since: DOM Level 3
*/
@@ -1564,7 +1564,7 @@
}
/* }}} end dom_document_loadxml */
-/* {{{ proto long domnode dom_document_save(string file);
+/* {{{ proto long|domnode dom_document_save(string file);
Convenience method to save to file
*/
PHP_FUNCTION(dom_document_save)
@@ -1600,7 +1600,7 @@
}
/* }}} end dom_document_save */
-/* {{{ proto string domnode dom_document_savexml([node n]);
+/* {{{ proto string|domnode dom_document_savexml([node n]);
URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-saveXML
Since: DOM Level 3
*/
@@ -1729,7 +1729,7 @@
}
-/* {{{ proto string domnode dom_document_validate();
+/* {{{ proto string|domnode dom_document_validate();
Since: DOM extended
*/
PHP_FUNCTION(dom_document_validate)
@@ -1842,14 +1842,14 @@
}
}
-/* {{{ proto boolean domnode _dom_document_schema_validate(string filename); */
+/* {{{ proto boolean|domnode _dom_document_schema_validate(string filename); */
PHP_FUNCTION(dom_document_schema_validate_file)
{
_dom_document_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE);
}
/* }}} end _dom_document_schema_validate */
-/* {{{ proto boolean domnode _dom_document_schema_validate(string source); */
+/* {{{ proto boolean|domnode _dom_document_schema_validate(string source); */
PHP_FUNCTION(dom_document_schema_validate_xml)
{
_dom_document_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU,
DOM_LOAD_STRING);
@@ -1932,14 +1932,14 @@
}
}
-/* {{{ proto boolean domnode dom_document_relaxNG_validate_file(string filename); */
+/* {{{ proto boolean|domnode dom_document_relaxNG_validate_file(string filename); */
PHP_FUNCTION(dom_document_relaxNG_validate_file)
{
_dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU,
DOM_LOAD_FILE);
}
/* }}} end dom_document_relaxNG_validate_file */
-/* {{{ proto boolean domnode dom_document_relaxNG_validate_xml(string source); */
+/* {{{ proto boolean|domnode dom_document_relaxNG_validate_xml(string source); */
PHP_FUNCTION(dom_document_relaxNG_validate_xml)
{
_dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU,
DOM_LOAD_STRING);
@@ -2022,7 +2022,7 @@
}
}
-/* {{{ proto boolean domnode dom_document_load_html_file(string source);
+/* {{{ proto boolean|domnode dom_document_load_html_file(string source);
Since: DOM extended
*/
PHP_METHOD(domdocument, loadHTMLFile)
@@ -2031,7 +2031,7 @@
}
/* }}} end dom_document_load_html_file */
-/* {{{ proto boolean domnode dom_document_load_html(string source);
+/* {{{ proto boolean|domnode dom_document_load_html(string source);
Since: DOM extended
*/
PHP_METHOD(domdocument, loadHTML)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/ming ming.c
zeevSun May 30 11:11:57 2004 EDT
Modified files:
/php-src/ext/ming ming.c
Log:
Update to PHP-style prototypes
(a PHP function returning char *? What were you smoking? :)
http://cvs.php.net/diff.php/php-src/ext/ming/ming.c?r1=1.67r2=1.68ty=u
Index: php-src/ext/ming/ming.c
diff -u php-src/ext/ming/ming.c:1.67 php-src/ext/ming/ming.c:1.68
--- php-src/ext/ming/ming.c:1.67Mon Mar 29 14:31:29 2004
+++ php-src/ext/ming/ming.c Sun May 30 11:11:57 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: ming.c,v 1.67 2004/03/29 19:31:29 helly Exp $ */
+/* $Id: ming.c,v 1.68 2004/05/30 15:11:57 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -274,7 +274,7 @@
/* {{{ SWFAction
*/
-/* {{{ proto object swfaction_init(string)
+/* {{{ proto object swfaction::__construct(string)
Returns a new SWFAction object, compiling the given script */
PHP_METHOD(swfaction, __construct)
{
@@ -323,7 +323,7 @@
/* {{{ SWFBitmap
*/
-/* {{{ proto class swfbitmap_init(mixed file [, mixed maskfile])
+/* {{{ proto class swfbitmap::__construct(mixed file [, mixed maskfile])
Returns a new SWFBitmap object from jpg (with optional mask) or dbl file */
PHP_METHOD(swfbitmap, __construct)
{
@@ -391,7 +391,7 @@
}
/* }}} */
-/* {{{ proto float swfbitmap_getWidth(void)
+/* {{{ proto float swfbitmap::getWidth()
Returns the width of this bitmap */
PHP_METHOD(swfbitmap, getWidth)
{
@@ -399,7 +399,7 @@
}
/* }}} */
-/* {{{ proto float swfbitmap_getHeight(void)
+/* {{{ proto float swfbitmap::getHeight()
Returns the height of this bitmap */
PHP_METHOD(swfbitmap, getHeight)
{
@@ -418,7 +418,7 @@
/* {{{ SWFButton
*/
-/* {{{ proto object swfbutton_init(void)
+/* {{{ proto object swfbutton::__construct()
Returns a new SWFButton object */
PHP_METHOD(swfbutton, __construct)
{
@@ -449,7 +449,7 @@
}
/* }}} */
-/* {{{ proto void swfbutton_setHit(object SWFCharacter)
+/* {{{ proto void swfbutton::setHit(object SWFCharacter)
Sets the character for this button's hit test state */
PHP_METHOD(swfbutton, setHit)
{
@@ -467,7 +467,7 @@
}
/* }}} */
-/* {{{ proto void swfbutton_setOver(object SWFCharacter)
+/* {{{ proto void swfbutton::setOver(object SWFCharacter)
Sets the character for this button's over state */
PHP_METHOD(swfbutton, setOver)
{
@@ -485,7 +485,7 @@
}
/* }}} */
-/* {{{ proto void swfbutton_setUp(object SWFCharacter)
+/* {{{ proto void swfbutton::setUp(object SWFCharacter)
Sets the character for this button's up state */
PHP_METHOD(swfbutton, setUp)
{
@@ -503,7 +503,7 @@
}
/* }}} */
-/* {{{ proto void swfbutton_setDown(object SWFCharacter)
+/* {{{ proto void swfbutton::setDown(object SWFCharacter)
Sets the character for this button's down state */
PHP_METHOD(swfbutton, setDown)
{
@@ -521,7 +521,7 @@
}
/* }}} */
-/* {{{ proto void swfbutton_addShape(object SWFCharacter, int flags)
+/* {{{ proto void swfbutton::addShape(object SWFCharacter, int flags)
Sets the character to display for the condition described in flags */
PHP_METHOD(swfbutton, addShape)
{
@@ -541,7 +541,7 @@
/* }}} */
#ifdef HAVE_NEW_MING
-/* {{{ proto void swfbutton_setMenu(int flag)
+/* {{{ proto void swfbutton::setMenu(int flag)
enable track as menu button behaviour */
PHP_METHOD(swfbutton, setMenu)
@@ -557,7 +557,7 @@
/* }}} */
#endif
-/* {{{ proto void swfbutton_setAction(object SWFAction)
+/* {{{ proto void swfbutton::setAction(object SWFAction)
Sets the action to perform when button is pressed */
PHP_METHOD(swfbutton, setAction)
{
@@ -576,7 +576,7 @@
/* }}} */
#ifdef HAVE_NEW_MING
-/* {{{ proto SWFSoundInstance * swfbutton_addASound(SWFSound sound, int flags)
+/* {{{ proto SWFSoundInstance swfbutton::addASound(SWFSound sound, int flags)
associates a sound with a button transition
NOTE: the transitions are all wrong _UP, _OVER, _DOWN _HIT */
@@ -608,7 +608,7 @@
/* }}} */
#endif
-/* {{{ proto void swfbutton_addAction(object SWFAction, int flags)
+/* {{{ proto void swfbutton::addAction(object SWFAction, int flags)
Sets the action to perform when conditions described in flags is met */
PHP_METHOD(swfbutton, addAction)
{
@@ -685,7 +685,7 @@
}
/* }}} */
-/* {{{ proto void swfdisplayitem_moveTo(int x, int y)
+/* {{{ proto void swfdisplayitem::moveTo(int x, int y)
Moves this SWFDisplayItem to movie coordinates (x, y) */
PHP_METHOD(swfdisplayitem, moveTo)
{
@@ -701,7 +701,7 @@
}
/* }}} */
-/* {{{ proto void swfdisplayitem_move(float dx, float dy)
+/* {{{ proto void swfdisplayitem::move(float dx, float dy)
Displaces this SWFDisplayItem by (dx, dy) in movie coordinates */
PHP_METHOD(swfdisplayitem, move)
{
@@ -717,7 +717,7 @@
}
/* }}} */
-/* {{{ proto void swfdisplayitem_scaleTo(float xScale [, float yScale])
+/* {{{ proto void swfdisplayitem::scaleTo(float xScale [, float yScale])
Scales this
[PHP-CVS] cvs: php-src /ext/spl spl_iterators.c
zeevSun May 30 13:32:32 2004 EDT
Modified files:
/php-src/ext/splspl_iterators.c
Log:
Fix prototype
http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.36r2=1.37ty=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.36 php-src/ext/spl/spl_iterators.c:1.37
--- php-src/ext/spl/spl_iterators.c:1.36Tue May 18 16:39:35 2004
+++ php-src/ext/spl/spl_iterators.c Sun May 30 13:32:32 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_iterators.c,v 1.36 2004/05/18 20:39:35 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.37 2004/05/30 17:32:32 zeev Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -985,7 +985,7 @@
}
}
-/* {{{ proto LimitIterator:__construct(Iterator $it [, int $offset, int $count])
+/* {{{ proto LimitIterator::__construct(Iterator $it [, int $offset, int $count])
Construct a LimitIterator from an Iterator with a given starting offset and
optionally a maximum count */
SPL_METHOD(LimitIterator, __construct)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom node.c
zeevSun May 30 13:34:11 2004 EDT
Modified files:
/php-src/ext/domnode.c
Log:
No meaning for unsigned
http://cvs.php.net/diff.php/php-src/ext/dom/node.c?r1=1.26r2=1.27ty=u
Index: php-src/ext/dom/node.c
diff -u php-src/ext/dom/node.c:1.26 php-src/ext/dom/node.c:1.27
--- php-src/ext/dom/node.c:1.26 Wed Feb 18 15:37:30 2004
+++ php-src/ext/dom/node.c Sun May 30 13:34:11 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: node.c,v 1.26 2004/02/18 20:37:30 rrichards Exp $ */
+/* $Id: node.c,v 1.27 2004/05/30 17:34:11 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1412,7 +1412,7 @@
/* }}} end dom_node_has_attributes */
-/* {{{ proto unsigned short dom_node_compare_document_position(node other);
+/* {{{ proto short dom_node_compare_document_position(node other);
URL:
http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-compareDocumentPosition
Since: DOM Level 3
*/
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache_hooks php_apache.c
zeevSun May 30 13:53:12 2004 EDT
Modified files:
/php-src/sapi/apache_hooks php_apache.c
Log:
Fix prototypes
http://cvs.php.net/diff.php/php-src/sapi/apache_hooks/php_apache.c?r1=1.16r2=1.17ty=u
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u php-src/sapi/apache_hooks/php_apache.c:1.16
php-src/sapi/apache_hooks/php_apache.c:1.17
--- php-src/sapi/apache_hooks/php_apache.c:1.16 Thu Jan 8 03:18:06 2004
+++ php-src/sapi/apache_hooks/php_apache.c Sun May 30 13:53:12 2004
@@ -17,7 +17,7 @@
| David Sklar [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_apache.c,v 1.16 2004/01/08 08:18:06 andi Exp $ */
+/* $Id: php_apache.c,v 1.17 2004/05/30 17:53:12 zeev Exp $ */
#include php_apache_http.h
@@ -273,7 +273,7 @@
/* {{{ access string slots of request rec
*/
-/* {{{ proto string $request-filename([string new_filename])
+/* {{{ proto string ApacheRequest::filename([string new_filename])
*/
PHP_FUNCTION(apache_request_filename)
{
@@ -281,7 +281,7 @@
}
/* }}} */
-/* {{{ proto string $request-uri([string new_uri])
+/* {{{ proto string ApacheRequest::uri([string new_uri])
*/
PHP_FUNCTION(apache_request_uri)
{
@@ -289,7 +289,7 @@
}
/* }}} */
-/* {{{ proto string $request-unparsed_uri([string new_unparsed_uri])
+/* {{{ proto string ApacheRequest::unparsed_uri([string new_unparsed_uri])
*/
PHP_FUNCTION(apache_request_unparsed_uri)
{
@@ -297,7 +297,7 @@
}
/* }}} */
-/* {{{ proto string $request-path_info([string new_path_info])
+/* {{{ proto string ApacheRequest::path_info([string new_path_info])
*/
PHP_FUNCTION(apache_request_path_info)
{
@@ -305,7 +305,7 @@
}
/* }}} */
-/* {{{ proto string $request-args([string new_args])
+/* {{{ proto string ApacheRequest::args([string new_args])
*/
PHP_FUNCTION(apache_request_args)
{
@@ -313,7 +313,7 @@
}
/* }}} */
-/* {{{ proto string $request-boundary()
+/* {{{ proto string ApacheRequest::boundary()
*/
PHP_FUNCTION(apache_request_boundary)
{
@@ -322,7 +322,7 @@
/* }}} */
-/* {{{ proto string $request-content_type([string new_type])
+/* {{{ proto string ApacheRequest::content_type([string new_type])
*/
PHP_FUNCTION(apache_request_content_type)
{
@@ -330,7 +330,7 @@
}
/* }}} */
-/* {{{ proto string $request-content_encoding([string new_encoding])
+/* {{{ proto string ApacheRequest::content_encoding([string new_encoding])
*/
PHP_FUNCTION(apache_request_content_encoding)
{
@@ -338,7 +338,7 @@
}
/* }}} */
-/* {{{ proto string $request-handler([string new_handler])
+/* {{{ proto string ApacheRequest::handler([string new_handler])
*/
PHP_FUNCTION(apache_request_handler)
{
@@ -346,7 +346,7 @@
}
/* }}} */
-/* {{{ proto string $request-the_request()
+/* {{{ proto string ApacheRequest::the_request()
*/
PHP_FUNCTION(apache_request_the_request)
{
@@ -354,7 +354,7 @@
}
/* }}} */
-/* {{{ proto string $request-protocol()
+/* {{{ proto string ApacheRequest::protocol()
*/
PHP_FUNCTION(apache_request_protocol)
{
@@ -362,7 +362,7 @@
}
/* }}} */
-/* {{{ proto string $request-hostname()
+/* {{{ proto string ApacheRequest::hostname()
*/
PHP_FUNCTION(apache_request_hostname)
{
@@ -370,7 +370,7 @@
}
/* }}} */
-/* {{{ proto string $request-status_line([string new_status_line])
+/* {{{ proto string ApacheRequest::status_line([string new_status_line])
*/
PHP_FUNCTION(apache_request_status_line)
{
@@ -378,7 +378,7 @@
}
/* }}} */
-/* {{{ proto string $request-method()
+/* {{{ proto string ApacheRequest::method()
*/
PHP_FUNCTION(apache_request_method)
{
@@ -391,7 +391,7 @@
/* {{{ access int slots of request_rec
*/
-/* {{{ proto int $request-proto_num()
+/* {{{ proto int ApacheRequest::proto_num()
*/
PHP_FUNCTION(apache_request_proto_num)
{
@@ -399,7 +399,7 @@
}
/* }}} */
-/* {{{ proto int $request-assbackwards()
+/* {{{ proto int ApacheRequest::assbackwards()
*/
PHP_FUNCTION(apache_request_assbackwards)
{
@@ -408,7 +408,7 @@
/* }}} */
-/* {{{ proto int $request-proxyreq([int new_proxyreq])
+/* {{{ proto int ApacheRequest::proxyreq([int new_proxyreq])
*/
PHP_FUNCTION(apache_request_proxyreq)
{
@@ -416,7 +416,7 @@
}
/* }}} */
-/* {{{ proto int $request-chunked()
+/* {{{ proto int ApacheRequest::chunked()
*/
PHP_FUNCTION(apache_request_chunked)
{
@@ -425,7 +425,7 @@
/* }}} */
-/* {{{ proto int $request-header_only()
+/* {{{ proto int ApacheRequest::header_only()
*/
PHP_FUNCTION(apache_request_header_only)
{
@@ -433,7 +433,7 @@
}
/* }}} */
-/* {{{ proto int $request-request_time()
+/* {{{ proto int ApacheRequest::request_time()
*/
PHP_FUNCTION(apache_request_request_time)
{
@@ -441,7 +441,7 @@
}
/* }}} */
-/* {{{ proto int $request-status([int new_status])
+/* {{{ proto int ApacheRequest::status([int new_status])
*/
PHP_FUNCTION(apache_request_status)
{
@@ -449,7 +449,7 @@
}
/* }}}
[PHP-CVS] cvs: php-src /win32 php5dllts.dsp
zeevMon May 10 08:06:09 2004 EDT Modified files: /php-src/win32 php5dllts.dsp Log: Fix Win32 build http://cvs.php.net/diff.php/php-src/win32/php5dllts.dsp?r1=1.1r2=1.2ty=u Index: php-src/win32/php5dllts.dsp diff -u php-src/win32/php5dllts.dsp:1.1 php-src/win32/php5dllts.dsp:1.2 --- php-src/win32/php5dllts.dsp:1.1 Sat Jan 17 08:00:22 2004 +++ php-src/win32/php5dllts.dsp Mon May 10 08:06:09 2004 @@ -2364,6 +2364,10 @@ # End Source File # Begin Source File +SOURCE=..\ext\com_dotnet\com_persist.c +# End Source File +# Begin Source File + SOURCE=..\ext\com_dotnet\com_typeinfo.c # End Source File # Begin Source File -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
zeevWed Apr 14 12:28:49 2004 EDT Modified files: /CVSROOTavail Log: Add area for public Zend extensions http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.842r2=1.843ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.842 CVSROOT/avail:1.843 --- CVSROOT/avail:1.842 Wed Apr 14 11:18:19 2004 +++ CVSROOT/avail Wed Apr 14 12:28:49 2004 @@ -205,6 +205,9 @@ avail|tony2001|pecl/memcache avail|dufuz|pear/Perm_LiveUser +# Public Zend extensions +avail|andi,stas,zeev,shie,rafi|ZendExtensions + # Curl modules avail|bagder,sterling,crisb,linus_nielsen|curl,curl-cpp,curl-java,curl-perl,curl-php,curl-www -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: CVSROOT / avail
At 19:55 14/04/2004, Wez Furlong wrote: Don't you think this is going a bit too far? We had discussed a solution for the particular problem that sparked this, but you left too quickly for things to be finalized. Why are you so eager to commit? Why aren't the rest of the PHP people allowed to commit to this Zend Extension stuff? Don't you want our input? If it's for Zend only stuff, why not put it in the Zend cvs repos? What is the point of having the rest of the PHP community around if you're going to ignore them and do whatever you want anyway? Wez, I really have no more mental strength for this, which is why I left after discussing this for a fairly long time. About the CVS repository, considering the PHP community demanded that the public Zend CVS repository moves to cvs.php.net and that's eventually what happened, that's the only place to put it. I don't think that PECL should be something that requires WFF (Warm Fuzzy Feeling) from people. It should be a place where everyone can put useful extensions. If that's not the place, then maybe it's time to create such a place. I don't mind renaming it to non-pecl or whatever, but not providing a solution inside pecl and blocking a solution outside of pecl is not an option. By the way, as was more than evident from what I said in the IRC discussion, I don't care at all whether someone ends up porting it to PEAR, or whether people gradually replace calls to the CVS binary with the implementation of the CVS protocol (which I think is a bad idea, but not for me to decide). Zeev -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: CVSROOT / avail
At 20:07 14/04/2004, Derick Rethans wrote: On Wed, 14 Apr 2004, Zeev Suraski wrote: zeev Wed Apr 14 12:28:49 2004 EDT Modified files: /CVSROOT avail Log: Add area for public Zend extensions I think this is rather childish. If I can not get what I want I'll make my own sandbox. Well, feel free to do so, but keep the other kids out of it. ie: keep it in the zend CVS. Making a new module in PHP CVS just because of this is just stupid. Sorry, that option ended when the public Zend CVS moved over to cvs.php.net. Zeev -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
zeevWed Apr 14 13:14:11 2004 EDT Modified files: /CVSROOTavail Log: Let everyone with C CVS access to work on non-pecl http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.843r2=1.844ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.843 CVSROOT/avail:1.844 --- CVSROOT/avail:1.843 Wed Apr 14 12:28:49 2004 +++ CVSROOT/avail Wed Apr 14 13:14:10 2004 @@ -17,7 +17,7 @@ # The PHP Developers have full access to the full source trees for # PHP and PEAR, as well as the documentation. -avail|alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye|phpfi,php3,php-src,pecl,pear,peardoc,spl,phpdoc,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,livedocs +avail|alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi|phpfi,php3,php-src,pecl,non-pecl,pear,peardoc,spl,phpdoc,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,livedocs # People who work on the Engine avail|andi,zeev,andrei,stas,sterling,sascha,derick,sebastian,phanto,sniper,hirokawa,fujimoto,rvenkat,sesser,kalowsky,iliaa,hyanantha,georg,wez,edink,helly,hholzgra,imajes,gschlossnagle,moriyoshi,dmitry,jon|Zend,ZendEngine2,TSRM @@ -205,9 +205,6 @@ avail|tony2001|pecl/memcache avail|dufuz|pear/Perm_LiveUser -# Public Zend extensions -avail|andi,stas,zeev,shie,rafi|ZendExtensions - # Curl modules avail|bagder,sterling,crisb,linus_nielsen|curl,curl-cpp,curl-java,curl-perl,curl-php,curl-www -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: CVSROOT / avail
At 19:55 14/04/2004, Wez Furlong wrote: If it's for Zend only stuff, why not put it in the Zend cvs repos? For the sake of clarity, I renamed it to 'non-pecl', and moved the ACL to be the same as pecl's. Zeev -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS configure.in /main php_version.h ZendEngine2 zend.h
zeevThu Mar 18 09:12:28 2004 EDT Modified files: /php-srcNEWS configure.in /ZendEngine2zend.h /php-src/main php_version.h Log: Prepare to roll RC1 http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1644r2=1.1645ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1644 php-src/NEWS:1.1645 --- php-src/NEWS:1.1644 Thu Mar 18 05:39:39 2004 +++ php-src/NEWSThu Mar 18 09:12:25 2004 @@ -1,6 +1,12 @@ PHPNEWS ||| -?? March 2004, PHP 5 Release Candidate 1 +18 March 2004, PHP 5 Release Candidate 1 +- Fixed numerous bugs with the just-in-time auto-global initialization, that + could cause $_SERVER, $argv/$argc and other variables not to work properly. + (Zeev) +- Fixed data corruption with constant assignments to object properties. (Zeev) +- Changed __toString() to be called automatically only with print and echo + statements. (Andi) - Replaced the exec_finished hook by the zend_post_deactive hook for extensions. The new hook will be run after the symbol table and destructors are run. (Derick) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.496r2=1.497ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.496 php-src/configure.in:1.497 --- php-src/configure.in:1.496 Fri Mar 12 16:45:55 2004 +++ php-src/configure.inThu Mar 18 09:12:25 2004 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.496 2004/03/12 21:45:55 pollita Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.497 2004/03/18 14:12:25 zeev 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=RC1 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/ZendEngine2/zend.h?r1=1.240r2=1.241ty=u Index: ZendEngine2/zend.h diff -u ZendEngine2/zend.h:1.240 ZendEngine2/zend.h:1.241 --- ZendEngine2/zend.h:1.240Tue Mar 16 17:27:26 2004 +++ ZendEngine2/zend.h Thu Mar 18 09:12:26 2004 @@ -17,12 +17,12 @@ +--+ */ -/* $Id: zend.h,v 1.240 2004/03/16 22:27:26 derick Exp $ */ +/* $Id: zend.h,v 1.241 2004/03/18 14:12:26 zeev Exp $ */ #ifndef ZEND_H #define ZEND_H -#define ZEND_VERSION 2.0.0-dev +#define ZEND_VERSION 2.0.0RC1 #define ZEND_ENGINE_2 http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.82r2=1.83ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.82 php-src/main/php_version.h:1.83 --- php-src/main/php_version.h:1.82 Thu Feb 12 11:26:59 2004 +++ php-src/main/php_version.h Thu Mar 18 09:12:27 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 RC1 +#define PHP_VERSION 5.0.0RC1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
zeevThu Mar 18 09:14:27 2004 EDT Modified files: /php-srcNEWS Log: Add missing bug updates http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1645r2=1.1646ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1645 php-src/NEWS:1.1646 --- php-src/NEWS:1.1645 Thu Mar 18 09:12:25 2004 +++ php-src/NEWSThu Mar 18 09:14:26 2004 @@ -82,6 +82,8 @@ - Fixed bug #27123 (Fix crash caused by bug in get_object_vars()). (Andi) - Fixed bug #26677 (mbstring compile errors with IRIX compiler). (K.Kosako kosako at sofnec dot co dot jp, Rui, Moriyoshi) +- Fixed bug #26206 (register_long_arrays breaks superglobals). (Zeev) +- Fixed bug #25724 (argv and argc not defined). (Zeev) 12 Feb 2004, PHP 5 Beta 4 - Changed exceptions so that they must now inherit from the built-in Exception -- 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 php_globals.h php_variables.c
zeevTue Mar 16 14:49:20 2004 EDT
Modified files:
/php-src/main main.c php_globals.h php_variables.c
Log:
Improve the way auto-globals JIT works, and add the ability to turn it off
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.597r2=1.598ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.597 php-src/main/main.c:1.598
--- php-src/main/main.c:1.597 Tue Mar 16 05:14:57 2004
+++ php-src/main/main.c Tue Mar 16 14:49:18 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.597 2004/03/16 10:14:57 helly Exp $ */
+/* $Id: main.c,v 1.598 2004/03/16 19:49:18 zeev Exp $ */
/* {{{ includes
*/
@@ -273,6 +273,7 @@
STD_PHP_INI_BOOLEAN(register_argc_argv, 1,
PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateBool, register_argc_argv,
php_core_globals, core_globals)
STD_PHP_INI_BOOLEAN(register_globals, 0,
PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateBool, register_globals,
php_core_globals, core_globals)
STD_PHP_INI_BOOLEAN(register_long_arrays, 1,
PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateBool, register_long_arrays,
php_core_globals, core_globals)
+ STD_PHP_INI_BOOLEAN(auto_globals_jit, 1,
PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateBool, auto_globals_jit,
php_core_globals, core_globals)
#if PHP_SAFE_MODE
STD_PHP_INI_BOOLEAN(safe_mode,1,
PHP_INI_SYSTEM, OnUpdateBool, safe_mode,
php_core_globals, core_globals)
#else
http://cvs.php.net/diff.php/php-src/main/php_globals.h?r1=1.96r2=1.97ty=u
Index: php-src/main/php_globals.h
diff -u php-src/main/php_globals.h:1.96 php-src/main/php_globals.h:1.97
--- php-src/main/php_globals.h:1.96 Sun Jan 25 23:15:08 2004
+++ php-src/main/php_globals.h Tue Mar 16 14:49:19 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_globals.h,v 1.96 2004/01/26 04:15:08 sniper Exp $ */
+/* $Id: php_globals.h,v 1.97 2004/03/16 19:49:19 zeev Exp $ */
#ifndef PHP_GLOBALS_H
#define PHP_GLOBALS_H
@@ -121,6 +121,7 @@
zend_bool register_globals;
zend_bool register_long_arrays;
zend_bool register_argc_argv;
+ zend_bool auto_globals_jit;
zend_bool y2k_compliance;
http://cvs.php.net/diff.php/php-src/main/php_variables.c?r1=1.76r2=1.77ty=u
Index: php-src/main/php_variables.c
diff -u php-src/main/php_variables.c:1.76 php-src/main/php_variables.c:1.77
--- php-src/main/php_variables.c:1.76 Sun Jan 25 23:15:08 2004
+++ php-src/main/php_variables.cTue Mar 16 14:49:19 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_variables.c,v 1.76 2004/01/26 04:15:08 sniper Exp $ */
+/* $Id: php_variables.c,v 1.77 2004/03/16 19:49:19 zeev Exp $ */
#include stdio.h
#include php.h
@@ -543,6 +543,7 @@
static zend_bool php_auto_globals_create_env(char *name, uint name_len TSRMLS_DC);
static zend_bool php_auto_globals_create_request(char *name, uint name_len TSRMLS_DC);
+
/* {{{ php_hash_environment
*/
int php_hash_environment(TSRMLS_D)
@@ -551,7 +552,7 @@
unsigned char _gpc_flags[5] = {0, 0, 0, 0, 0};
zval *dummy_track_vars_array = NULL;
zend_bool initialized_dummy_track_vars_array=0;
- zend_bool jit_initialization = (!PG(register_globals)
!PG(register_long_arrays));
+ zend_bool jit_initialization = (PG(auto_globals_jit) !PG(register_globals)
!PG(register_long_arrays) !PG(register_argc_argv));
struct auto_global_record {
char *name;
uint name_len;
@@ -609,6 +610,7 @@
case 'e':
case 'E':
if (!jit_initialization !_gpc_flags[3]) {
+ zend_auto_global_disable_jit(_ENV,
sizeof(_ENV)-1 TSRMLS_CC);
php_auto_globals_create_env(_ENV,
sizeof(_ENV)-1 TSRMLS_CC);
_gpc_flags[3]=1;
if (PG(register_globals)) {
@@ -619,6 +621,7 @@
case 's':
case 'S':
if (!jit_initialization !_gpc_flags[4]) {
+ zend_auto_global_disable_jit(_SERVER,
sizeof(_SERVER)-1 TSRMLS_CC);
php_register_server_variables(TSRMLS_C);
_gpc_flags[4]=1;
if (PG(register_globals)) {
@@ -660,6 +663,7 @@
/* Create _REQUEST */
if (!jit_initialization) {
+ zend_auto_global_disable_jit(_REQUEST,
[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended /main main.c
zeevWed Feb 25 05:58:07 2004 EDT Modified files: /php-srcphp.ini-dist php.ini-recommended /php-src/main main.c Log: - Rename compatiblity mode to zend.ze2_compatibility_mode (it doesn't only affect auto-clone). - Perform implementation checks even with simple inheritance (off when compatibility mode is enabled). - Restore default arguments in interfaces and handle it correctly. - Move registration of internal classes later in the startup sequence in order to have INI options available. http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.206r2=1.207ty=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.206 php-src/php.ini-dist:1.207 --- php-src/php.ini-dist:1.206 Mon Feb 9 19:02:37 2004 +++ php-src/php.ini-distWed Feb 25 05:58:05 2004 @@ -67,7 +67,10 @@ ; Enable the PHP scripting language engine under Apache. engine = On -; Allow the ? tag. Otherwise, only ?php and script tags are recognized. +; Enable compatibility mode with Zend Engine 1 (PHP 4.x) +zend.ze1_compatibility_mode = Off + +; Allow the ? tag. Otherwise, only ?php and script tags are recognized. ; NOTE: Using short tags should be avoided when developing applications or ; libraries that are meant for redistribution, or deployment on PHP ; servers which are not under your control, because short tags may not @@ -99,18 +102,18 @@ ; Setting any output handler automatically turns on output buffering. ; Note: People who wrote portable scripts should not depend on this ini ; directive. Instead, explicitly set the output handler using ob_start(). -; Using this ini directive may cause problems unless you know what script +; Using this ini directive may cause problems unless you know what script ; is doing. ; Note: You cannot use both mb_output_handler with ob_iconv_handler -; and you cannot use both ob_gzhandler and zlib.output_compression. +; and you cannot use both ob_gzhandler and zlib.output_compression. ;output_handler = ; Transparent output compression using the zlib library ; Valid values for this option are 'off', 'on', or a specific buffer size ; to be used for compression (default is 4KB) -; Note: Resulting chunk size may vary due to nature of compression. PHP -; outputs chunks that are few hundreds bytes each as a result of -; compression. If you prefer a larger chunk size for better +; Note: Resulting chunk size may vary due to nature of compression. PHP +; outputs chunks that are few hundreds bytes each as a result of +; compression. If you prefer a larger chunk size for better ; performance, enable output_buffering in addition. ; Note: You need to use zlib.output_handler instead of the standard ; output_handler, or otherwise the output will be corrupted. @@ -133,7 +136,7 @@ ; which should be instanciated. ; A warning appears if the specified function is not defined, or if the ; function doesn't include/implement the missing class. -; So only set this entry, if you really want to implement such a +; So only set this entry, if you really want to implement such a ; callback-function. unserialize_callback_func= @@ -166,7 +169,7 @@ ; including files from this directory and its subdirectories. ; (directory must also be in include_path or full path must ; be used when including) -safe_mode_include_dir = +safe_mode_include_dir = ; When safe_mode is on, only executables located in the safe_mode_exec_dir ; will be allowed to be executed via the exec family of functions. @@ -297,13 +300,13 @@ ; line until ignore_repeated_source is set true. ignore_repeated_errors = Off -; Ignore source of message when ignoring repeated messages. When this setting +; Ignore source of message when ignoring repeated messages. When this setting ; is On you will not log errors with repeated messages from different files or ; sourcelines. ignore_repeated_source = Off ; If this parameter is set to Off, then memory leaks will not be shown (on -; stdout or in the log). This has only effect in a debug compile, and if +; stdout or in the log). This has only effect in a debug compile, and if ; error reporting includes E_WARNING in the allowed list report_memleaks = On @@ -313,17 +316,17 @@ ; Disable the inclusion of HTML tags in error messages. ; Note: Never use this feature for production boxes. ;html_errors = Off - -; If html_errors is set On PHP produces clickable error messages that direct + +; If html_errors is set On PHP produces clickable error messages that direct ; to a page describing the error or function causing the error in detail. -; You can download a copy of the PHP manual from http://www.php.net/docs.php +; You can download a copy of the PHP manual from http://www.php.net/docs.php ; and change docref_root to the base URL of your local copy including the
[PHP-CVS] cvs: php-src / NEWS
zeevWed Feb 25 07:45:09 2004 EDT Modified files: /php-srcNEWS Log: update http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1612r2=1.1613ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1612 php-src/NEWS:1.1613 --- php-src/NEWS:1.1612 Mon Feb 16 11:00:15 2004 +++ php-src/NEWSWed Feb 25 07:45:07 2004 @@ -1,6 +1,11 @@ PHPNEWS ||| ?? ??? 2004, PHP 5 Release Candidate 1 +- Compatibility mode directive has been renamed to zend.ze2_compatibility_mode, + as it doesn't only affect implicit cloning. (Andi, Zeev) +- Methods that override parent methods are now subject to prototype checking, + and have to be compatible with the method they're overriding - this check + is disabled in compatibility mode. (Andi, Zeev) - Fixed problem preventing startup errors from being displayed. (Marcus) - Fixed start-up problem if both SPL and SimpleXML were enabled. The double initialization of apache 1.3 was causing problems here. (Marcus, Derick) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/lang bug22367.phpt
zeevWed Feb 25 09:57:43 2004 EDT
Modified files:
/php-src/tests/lang bug22367.phpt
Log:
This is no longer valid out of the box PHP 5 code.
We tried to enable compatibility mode but the test engine doesn't appear
to take the --INI-- section into account in compile time, so it didn't
work...
http://cvs.php.net/diff.php/php-src/tests/lang/bug22367.phpt?r1=1.4r2=1.5ty=u
Index: php-src/tests/lang/bug22367.phpt
diff -u php-src/tests/lang/bug22367.phpt:1.4 php-src/tests/lang/bug22367.phpt:1.5
--- php-src/tests/lang/bug22367.phpt:1.4Sun Dec 14 13:25:13 2003
+++ php-src/tests/lang/bug22367.phptWed Feb 25 09:57:43 2004
@@ -1,7 +1,10 @@
--TEST--
Bug #22367 (weird zval allocation problem)
+--SKIPIF--
+?php if(version_compare(zend_version(), 2.0.0-dev, '=')) echo skip Overriden
method does not match overriding method - incompatible with ZE2\n; ?
--FILE--
?php
+
class foo
{
public $test = array(0, 1, 2, 3, 4);
--
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_iterators.c
zeevWed Feb 25 09:58:48 2004 EDT Modified files: /php-src/ext/splspl_iterators.c Log: Fix signature Marcus - please make sure that this is ok. Generally you are no longer allowed to override a method and with an incompatible signature http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.20r2=1.21ty=u Index: php-src/ext/spl/spl_iterators.c diff -u php-src/ext/spl/spl_iterators.c:1.20 php-src/ext/spl/spl_iterators.c:1.21 --- php-src/ext/spl/spl_iterators.c:1.20Thu Feb 12 05:43:25 2004 +++ php-src/ext/spl/spl_iterators.c Wed Feb 25 09:58:47 2004 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: spl_iterators.c,v 1.20 2004/02/12 10:43:25 zeev Exp $ */ +/* $Id: spl_iterators.c,v 1.21 2004/02/25 14:58:47 zeev Exp $ */ #ifdef HAVE_CONFIG_H # include config.h @@ -1164,7 +1164,7 @@ } static -ZEND_BEGIN_ARG_INFO(arginfo_caching_rec_it___construct, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_caching_rec_it___construct, 0, ZEND_RETURN_REFERENCE_AGNOSTIC, 2) ZEND_ARG_INFO(0, iterator) ZEND_ARG_INFO(0, getStrVal) ZEND_ARG_INFO(0, catch_getChildren) -- 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 24 10:13:15 2004 EDT
Modified files:
/php-src/main main.c
Log:
Remove empty comment
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.593r2=1.594ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.593 php-src/main/main.c:1.594
--- php-src/main/main.c:1.593 Sun Feb 15 12:00:41 2004
+++ php-src/main/main.c Tue Feb 24 10:13:13 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.593 2004/02/15 17:00:41 helly Exp $ */
+/* $Id: main.c,v 1.594 2004/02/24 15:13:13 zeev Exp $ */
/* {{{ includes
*/
@@ -1488,7 +1488,6 @@
zend_post_startup(TSRMLS_C);
#endif
- /* */
module_initialized = 1;
sapi_deactivate(TSRMLS_C);
module_startup = 0;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /main main.c
That looks wrong, stuff that may be necessary for reporting this error may
not be initialized before module_initialized is on. Please revert or
explain why you think it's no longer necessary :)
Zeev
At 19:00 15/02/2004, Marcus Boerger wrote:
helly Sun Feb 15 12:00:43 2004 EDT
Modified files:
/php-src/main main.c
/php-srcNEWS
Log:
Fix startup errors
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.592r2=1.593ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.592 php-src/main/main.c:1.593
--- php-src/main/main.c:1.592 Thu Feb 12 05:43:27 2004
+++ php-src/main/main.c Sun Feb 15 12:00:41 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.592 2004/02/12 10:43:27 zeev Exp $ */
+/* $Id: main.c,v 1.593 2004/02/15 17:00:41 helly Exp $ */
/* {{{ includes
*/
@@ -751,8 +751,8 @@
php_log_err(log_buffer TSRMLS_CC);
efree(log_buffer);
}
- if (module_initialized PG(display_errors)
-(!PG(during_request_startup) ||
PG(display_startup_errors))) {
+ if (PG(display_errors)
+((!PG(during_request_startup)
PG(display_startup_errors)) || module_initialized)) {
if (PG(xmlrpc_errors)) {
php_printf(?xml
version=\1.0\?methodResponsefaultvaluestructmembernamefaultCode/namevalueint%ld/int/value/membermembernamefaultString/namevaluestring%s:%s
in %s on line
%d/string/value/member/struct/value/fault/methodResponse,
PG(xmlrpc_error_number), error_type_str, buffer, error_filename, error_lineno);
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1609r2=1.1610ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1609 php-src/NEWS:1.1610
--- php-src/NEWS:1.1609 Sat Feb 14 11:25:20 2004
+++ php-src/NEWSSun Feb 15 12:00:42 2004
@@ -1,6 +1,7 @@
PHP
NEWS
|||
?? ??? 2004, PHP 5 Release Candidate 1
+- Fixed problem preventing startup errors from being displayed. (Marcus)
- Fixed zero bytes memory allocation when no extra ini files are found
in the
--with-config-file-scan-dir specified directory. (Eric Colinet, Derick)
- Fixed start-up problem if both SPL and SimpleXML were enabled. The double
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/com_dotnet com_com.c com_dotnet.c com_extension.c com_handlers.c com_iterator.c com_misc.c com_saproxy.c /ext/dom php_dom.h /ext/mysql php_mysql.c /ext/mysqli mysqli.c /ext/pgsql pgsql.c /ext/simplexml simplexml.c /ext/soap soap.c /ext/spl spl_directory.c spl_iterators.c /ext/sqlite sqlite.c /ext/tidy tidy.c /main main.c ZendEngine2 zend_default_classes.h
zeevThu Feb 12 05:43:28 2004 EDT
Removed files:
/ZendEngine2zend_default_classes.h
Modified files:
/php-src/ext/com_dotnet com_com.c com_dotnet.c com_extension.c
com_handlers.c com_iterator.c com_misc.c
com_saproxy.c
/php-src/ext/domphp_dom.h
/php-src/ext/mysql php_mysql.c
/php-src/ext/mysqli mysqli.c
/php-src/ext/pgsql pgsql.c
/php-src/ext/simplexml simplexml.c
/php-src/ext/soap soap.c
/php-src/ext/splspl_directory.c spl_iterators.c
/php-src/ext/sqlite sqlite.c
/php-src/ext/tidy tidy.c
/php-src/main main.c
Log:
zend_default_classes.h - zend_exceptions.h
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_com.c?r1=1.10r2=1.11ty=u
Index: php-src/ext/com_dotnet/com_com.c
diff -u php-src/ext/com_dotnet/com_com.c:1.10 php-src/ext/com_dotnet/com_com.c:1.11
--- php-src/ext/com_dotnet/com_com.c:1.10 Tue Jan 13 08:38:11 2004
+++ php-src/ext/com_dotnet/com_com.cThu Feb 12 05:43:19 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_com.c,v 1.10 2004/01/13 13:38:11 wez Exp $ */
+/* $Id: com_com.c,v 1.11 2004/02/12 10:43:19 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -27,7 +27,7 @@
#include ext/standard/info.h
#include php_com_dotnet.h
#include php_com_dotnet_internal.h
-#include Zend/zend_default_classes.h
+#include Zend/zend_exceptions.h
/* {{{ com_create_instance - ctor for COM class */
PHP_FUNCTION(com_create_instance)
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_dotnet.c?r1=1.5r2=1.6ty=u
Index: php-src/ext/com_dotnet/com_dotnet.c
diff -u php-src/ext/com_dotnet/com_dotnet.c:1.5 php-src/ext/com_dotnet/com_dotnet.c:1.6
--- php-src/ext/com_dotnet/com_dotnet.c:1.5 Thu Jan 8 03:14:20 2004
+++ php-src/ext/com_dotnet/com_dotnet.c Thu Feb 12 05:43:19 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_dotnet.c,v 1.5 2004/01/08 08:14:20 andi Exp $ */
+/* $Id: com_dotnet.c,v 1.6 2004/02/12 10:43:19 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -29,7 +29,7 @@
# include ext/standard/info.h
# include php_com_dotnet.h
# include php_com_dotnet_internal.h
-# include Zend/zend_default_classes.h
+# include Zend/zend_exceptions.h
# include mscoree.h
struct dotnet_runtime_stuff {
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_extension.c?r1=1.8r2=1.9ty=u
Index: php-src/ext/com_dotnet/com_extension.c
diff -u php-src/ext/com_dotnet/com_extension.c:1.8
php-src/ext/com_dotnet/com_extension.c:1.9
--- php-src/ext/com_dotnet/com_extension.c:1.8 Tue Jan 13 08:38:11 2004
+++ php-src/ext/com_dotnet/com_extension.c Thu Feb 12 05:43:19 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_extension.c,v 1.8 2004/01/13 13:38:11 wez Exp $ */
+/* $Id: com_extension.c,v 1.9 2004/02/12 10:43:19 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -27,7 +27,7 @@
#include ext/standard/info.h
#include php_com_dotnet.h
#include php_com_dotnet_internal.h
-#include Zend/zend_default_classes.h
+#include Zend/zend_exceptions.h
ZEND_DECLARE_MODULE_GLOBALS(com_dotnet)
TsHashTable php_com_typelibraries;
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_handlers.c?r1=1.15r2=1.16ty=u
Index: php-src/ext/com_dotnet/com_handlers.c
diff -u php-src/ext/com_dotnet/com_handlers.c:1.15
php-src/ext/com_dotnet/com_handlers.c:1.16
--- php-src/ext/com_dotnet/com_handlers.c:1.15 Sun Feb 8 12:25:53 2004
+++ php-src/ext/com_dotnet/com_handlers.c Thu Feb 12 05:43:19 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_handlers.c,v 1.15 2004/02/08 17:25:53 zeev Exp $ */
+/* $Id: com_handlers.c,v 1.16 2004/02/12 10:43:19 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -27,7 +27,7 @@
#include ext/standard/info.h
#include php_com_dotnet.h
#include php_com_dotnet_internal.h
-#include Zend/zend_default_classes.h
+#include Zend/zend_exceptions.h
static zval *com_property_read(zval *object, zval *member, zend_bool silent TSRMLS_DC)
{
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_iterator.c?r1=1.5r2=1.6ty=u
Index: php-src/ext/com_dotnet/com_iterator.c
diff -u php-src/ext/com_dotnet/com_iterator.c:1.5
php-src/ext/com_dotnet/com_iterator.c:1.6
--- php-src/ext/com_dotnet/com_iterator.c:1.5 Thu Jan 8 03:14:20 2004
+++ php-src/ext/com_dotnet/com_iterator.c Thu Feb 12 05:43:19 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_iterator.c,v 1.5 2004/01/08 08:14:20 andi Exp $ */
+/* $Id: com_iterator.c,v 1.6 2004/02/12 10:43:19 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -27,7 +27,7
[PHP-CVS] cvs: php-src / configure.in
zeevThu Feb 12 06:47:54 2004 EDT Modified files: /php-srcconfigure.in Log: Update configure http://cvs.php.net/diff.php/php-src/configure.in?r1=1.492r2=1.493ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.492 php-src/configure.in:1.493 --- php-src/configure.in:1.492 Thu Feb 12 03:46:02 2004 +++ php-src/configure.inThu Feb 12 06:47:53 2004 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.492 2004/02/12 08:46:02 andi Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.493 2004/02/12 11:47:53 zeev Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1191,7 +1191,7 @@ zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \ zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \ zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c zend_stream.c \ -zend_iterators.c zend_interfaces.c) +zend_iterators.c zend_interfaces.c zend_exceptions.c) if test -r $abs_srcdir/Zend/zend_objects.c; then PHP_ADD_SOURCES(Zend, zend_objects.c zend_object_handlers.c zend_objects_API.c zend_mm.c \ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/lang error_2_exception_001.phpt
zeevThu Feb 12 07:37:05 2004 EDT
Modified files:
/php-src/tests/lang error_2_exception_001.phpt
Log:
extend Exception
http://cvs.php.net/diff.php/php-src/tests/lang/error_2_exception_001.phpt?r1=1.1r2=1.2ty=u
Index: php-src/tests/lang/error_2_exception_001.phpt
diff -u php-src/tests/lang/error_2_exception_001.phpt:1.1
php-src/tests/lang/error_2_exception_001.phpt:1.2
--- php-src/tests/lang/error_2_exception_001.phpt:1.1 Mon Mar 3 11:44:38 2003
+++ php-src/tests/lang/error_2_exception_001.phpt Thu Feb 12 07:37:04 2004
@@ -5,7 +5,7 @@
--FILE--
?php
-class MyException {
+class MyException extends Exception {
function MyException($_errno, $_errmsg) {
$this-errno = $_errno;
$this-errmsg = $_errmsg;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/com_dotnet com_saproxy.c
zeevThu Feb 12 08:53:51 2004 EDT
Modified files:
/php-src/ext/com_dotnet com_saproxy.c
Log:
Fix prototype/warning
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_saproxy.c?r1=1.4r2=1.5ty=u
Index: php-src/ext/com_dotnet/com_saproxy.c
diff -u php-src/ext/com_dotnet/com_saproxy.c:1.4
php-src/ext/com_dotnet/com_saproxy.c:1.5
--- php-src/ext/com_dotnet/com_saproxy.c:1.4Thu Feb 12 05:43:19 2004
+++ php-src/ext/com_dotnet/com_saproxy.cThu Feb 12 08:53:51 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_saproxy.c,v 1.4 2004/02/12 10:43:19 zeev Exp $ */
+/* $Id: com_saproxy.c,v 1.5 2004/02/12 13:53:51 zeev Exp $ */
/* This module implements a SafeArray proxy which is used internally
* by the engine when resolving multi-dimensional array accesses on
@@ -77,7 +77,7 @@
php_com_throw_exception(E_INVALIDARG, safearray has no properties TSRMLS_CC);
}
-static zval *saproxy_read_dimension(zval *object, zval *offset TSRMLS_DC)
+static zval *saproxy_read_dimension(zval *object, zval *offset, int type TSRMLS_DC)
{
php_com_saproxy *proxy = SA_FETCH(object);
zval *return_value;
--
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 /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/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
[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 /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 /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/com_dotnet com_handlers.c /ext/simplexml simplexml.c
zeevSun Feb 8 12:25:55 2004 EDT
Modified files:
/php-src/ext/com_dotnet com_handlers.c
/php-src/ext/simplexml simplexml.c
Log:
Update to new API
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_handlers.c?r1=1.14r2=1.15ty=u
Index: php-src/ext/com_dotnet/com_handlers.c
diff -u php-src/ext/com_dotnet/com_handlers.c:1.14
php-src/ext/com_dotnet/com_handlers.c:1.15
--- php-src/ext/com_dotnet/com_handlers.c:1.14 Wed Feb 4 06:14:30 2004
+++ php-src/ext/com_dotnet/com_handlers.c Sun Feb 8 12:25:53 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_handlers.c,v 1.14 2004/02/04 11:14:30 zeev Exp $ */
+/* $Id: com_handlers.c,v 1.15 2004/02/08 17:25:53 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -104,7 +104,7 @@
return obj-have_default_bind ? SUCCESS : FAILURE;
}
-static zval *com_read_dimension(zval *object, zval *offset TSRMLS_DC)
+static zval *com_read_dimension(zval *object, zval *offset, int type TSRMLS_DC)
{
zval *return_value;
php_com_dotnet_object *obj;
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.124r2=1.125ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.124 php-src/ext/simplexml/simplexml.c:1.125
--- php-src/ext/simplexml/simplexml.c:1.124 Wed Feb 4 06:12:31 2004
+++ php-src/ext/simplexml/simplexml.c Sun Feb 8 12:25:54 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.124 2004/02/04 11:12:31 zeev Exp $ */
+/* $Id: simplexml.c,v 1.125 2004/02/08 17:25:54 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -263,7 +263,7 @@
/* {{{ sxe_dimension_read()
*/
-static zval * sxe_dimension_read(zval *object, zval *offset TSRMLS_DC)
+static zval * sxe_dimension_read(zval *object, zval *offset, int type TSRMLS_DC)
{
return sxe_prop_dim_read(object, offset, 0, 1, 0 TSRMLS_CC);
}
@@ -1577,7 +1577,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.124 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.125 $);
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
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
zeevWed Feb 4 06:12:39 2004 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
- Update with new destructor code
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.123r2=1.124ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.123 php-src/ext/simplexml/simplexml.c:1.124
--- php-src/ext/simplexml/simplexml.c:1.123 Mon Feb 2 03:10:31 2004
+++ php-src/ext/simplexml/simplexml.c Wed Feb 4 06:12:31 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.123 2004/02/02 08:10:31 sniper Exp $ */
+/* $Id: simplexml.c,v 1.124 2004/02/04 11:12:31 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -114,16 +114,16 @@
/* {{{ match_ns()
*/
-static inline int
+static inline int
match_ns(php_sxe_object *sxe, xmlNodePtr node, xmlChar *name)
{
if (name == NULL (node-ns == NULL || node-ns-prefix == NULL)) {
return 1;
}
-
+
if (node-ns !xmlStrcmp(node-ns-href, name)) {
return 1;
- }
+ }
return 0;
}
@@ -392,7 +392,7 @@
newnode = node;
++counter;
}
-
+
next_iter:
node = node-next;
}
@@ -459,7 +459,7 @@
xmlNodePtr node;
xmlAttrPtr attr = NULL;
int exists = 0;
-
+
sxe = php_sxe_fetch_object(object TSRMLS_CC);
name = Z_STRVAL_P(member);
@@ -488,7 +488,7 @@
exists = 1;
break;
}
-
+
attr = attr-next;
}
}
@@ -568,9 +568,9 @@
node = node-children;
while (node) {
nnext = node-next;
-
+
SKIP_TEXT(node);
-
+
if (!xmlStrcmp(node-name, Z_STRVAL_P(member))) {
xmlUnlinkNode(node);
php_libxml_node_free_resource(node TSRMLS_CC);
@@ -613,7 +613,7 @@
xmlChar*contents;
MAKE_STD_ZVAL(*value);
-
+
if (node-children node-children-type == XML_TEXT_NODE
!xmlIsBlankNode(node-children)) {
contents = xmlNodeListGetString(node-doc, node-children, 1);
if (contents) {
@@ -676,7 +676,7 @@
goto next_iter;
}
}
-
+
name = (char *) node-name;
if (!name) {
goto next_iter;
@@ -685,7 +685,7 @@
}
_get_base_node_value(sxe, node, value TSRMLS_CC);
-
+
h = zend_hash_func(name, namelen);
if (zend_hash_quick_find(rv, name, namelen, h, (void **)
data_ptr) == SUCCESS) {
if (Z_TYPE_PP(data_ptr) == IS_ARRAY) {
@@ -738,7 +738,7 @@
/* }}} */
/* {{{ xpath()
- */
+ */
SXE_METHOD(xpath)
{
php_sxe_object*sxe;
@@ -813,7 +813,7 @@
add_next_index_zval(return_value, value);
}
}
-
+
xmlXPathFreeObject(retval);
}
/* }}} */
@@ -838,10 +838,10 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s, filename,
filename_len) == FAILURE) {
RETURN_FALSE;
}
-
+
sxe = php_sxe_fetch_object(getThis() TSRMLS_CC);
GET_NODE(sxe, node);
-
+
if (node) {
if (XML_DOCUMENT_NODE == node-parent-type) {
xmlSaveFile(filename, (xmlDocPtr) sxe-document-ptr);
@@ -850,7 +850,7 @@
if (outbuf == NULL) {
RETURN_FALSE;
- }
+ }
xmlNodeDumpOutput(outbuf, (xmlDocPtr)
sxe-document-ptr, node, 0, 1, NULL);
xmlOutputBufferClose(outbuf);
@@ -873,11 +873,11 @@
if (outbuf == NULL) {
RETURN_FALSE;
- }
+ }
xmlNodeDumpOutput(outbuf, (xmlDocPtr) sxe-document-ptr,
node, 0, 1, ((xmlDocPtr) sxe-document-ptr)-encoding);
[PHP-CVS] cvs: php-src /ext/com_dotnet com_handlers.c com_misc.c com_saproxy.c php_com_dotnet_internal.h /ext/dom php_dom.c /ext/mono php_mono.c /ext/mysqli mysqli.c /ext/sqlite sqlite.c /ext/tidy php_tidy.h tidy.c /ext/xsl php_xsl.c php_xsl.h
zeevWed Feb 4 06:14:48 2004 EDT
Modified files:
/php-src/ext/com_dotnet com_handlers.c com_misc.c com_saproxy.c
php_com_dotnet_internal.h
/php-src/ext/domphp_dom.c
/php-src/ext/mono php_mono.c
/php-src/ext/mysqli mysqli.c
/php-src/ext/sqlite sqlite.c
/php-src/ext/tidy php_tidy.h tidy.c
/php-src/ext/xslphp_xsl.c php_xsl.h
Log:
- Update with new destructor code
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_handlers.c?r1=1.13r2=1.14ty=u
Index: php-src/ext/com_dotnet/com_handlers.c
diff -u php-src/ext/com_dotnet/com_handlers.c:1.13
php-src/ext/com_dotnet/com_handlers.c:1.14
--- php-src/ext/com_dotnet/com_handlers.c:1.13 Tue Jan 13 11:05:38 2004
+++ php-src/ext/com_dotnet/com_handlers.c Wed Feb 4 06:14:30 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_handlers.c,v 1.13 2004/01/13 16:05:38 wez Exp $ */
+/* $Id: com_handlers.c,v 1.14 2004/02/04 11:14:30 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -554,7 +554,7 @@
}
}
-void php_com_object_dtor(void *object, zend_object_handle handle TSRMLS_DC)
+void php_com_object_free_storage(void *object TSRMLS_DC)
{
php_com_dotnet_object *obj = (php_com_dotnet_object*)object;
@@ -616,7 +616,8 @@
obj-code_page = CP_ACP;
obj-ce = ce;
- retval.handle = zend_objects_store_put(obj, php_com_object_dtor,
php_com_object_clone TSRMLS_CC);
+
+ retval.handle = zend_objects_store_put(obj, NULL, php_com_object_free_storage,
php_com_object_clone TSRMLS_CC);
retval.handlers = php_com_object_handlers;
return retval;
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_misc.c?r1=1.3r2=1.4ty=u
Index: php-src/ext/com_dotnet/com_misc.c
diff -u php-src/ext/com_dotnet/com_misc.c:1.3 php-src/ext/com_dotnet/com_misc.c:1.4
--- php-src/ext/com_dotnet/com_misc.c:1.3 Thu Jan 8 03:14:20 2004
+++ php-src/ext/com_dotnet/com_misc.c Wed Feb 4 06:14:30 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_misc.c,v 1.3 2004/01/08 08:14:20 andi Exp $ */
+/* $Id: com_misc.c,v 1.4 2004/02/04 11:14:30 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -60,7 +60,7 @@
IDispatch_GetTypeInfo(V_DISPATCH(obj-v), 0, LANG_NEUTRAL, obj-typeinfo);
Z_TYPE_P(z) = IS_OBJECT;
- z-value.obj.handle = zend_objects_store_put(obj, php_com_object_dtor,
php_com_object_clone TSRMLS_CC);
+ z-value.obj.handle = zend_objects_store_put(obj, NULL,
php_com_object_free_storage, php_com_object_clone TSRMLS_CC);
z-value.obj.handlers = php_com_object_handlers;
}
@@ -83,7 +83,7 @@
Z_TYPE_P(z) = IS_OBJECT;
- z-value.obj.handle = zend_objects_store_put(obj, php_com_object_dtor,
php_com_object_clone TSRMLS_CC);
+ z-value.obj.handle = zend_objects_store_put(obj, NULL,
php_com_object_free_storage, php_com_object_clone TSRMLS_CC);
z-value.obj.handlers = php_com_object_handlers;
}
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_saproxy.c?r1=1.2r2=1.3ty=u
Index: php-src/ext/com_dotnet/com_saproxy.c
diff -u php-src/ext/com_dotnet/com_saproxy.c:1.2
php-src/ext/com_dotnet/com_saproxy.c:1.3
--- php-src/ext/com_dotnet/com_saproxy.c:1.2Thu Jan 8 03:14:20 2004
+++ php-src/ext/com_dotnet/com_saproxy.cWed Feb 4 06:14:30 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_saproxy.c,v 1.2 2004/01/08 08:14:20 andi Exp $ */
+/* $Id: com_saproxy.c,v 1.3 2004/02/04 11:14:30 zeev Exp $ */
/* This module implements a SafeArray proxy which is used internally
* by the engine when resolving multi-dimensional array accesses on
@@ -261,7 +261,7 @@
saproxy_object_cast
};
-static void saproxy_dtor(void *object, zend_object_handle handle TSRMLS_DC)
+static void saproxy_free_storage(void *object TSRMLS_DC)
{
php_com_saproxy *proxy = (php_com_saproxy *)object;
@@ -313,7 +313,7 @@
proxy-indices[proxy-dimensions-1] = index;
Z_TYPE_P(proxy_out) = IS_OBJECT;
- Z_OBJ_HANDLE_P(proxy_out) = zend_objects_store_put(proxy, saproxy_dtor,
saproxy_clone TSRMLS_CC);
+ Z_OBJ_HANDLE_P(proxy_out) = zend_objects_store_put(proxy, NULL,
saproxy_free_storage, saproxy_clone TSRMLS_CC);
Z_OBJ_HT_P(proxy_out) = php_com_saproxy_handlers;
return 1;
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/php_com_dotnet_internal.h?r1=1.8r2=1.9ty=u
Index: php-src/ext/com_dotnet/php_com_dotnet_internal.h
diff -u php-src/ext/com_dotnet/php_com_dotnet_internal.h:1.8
php-src/ext/com_dotnet/php_com_dotnet_internal.h:1.9
--- php-src/ext/com_dotnet/php_com_dotnet_internal.h:1.8Tue Jan 13 08:38:11
2004
+++ php-src/ext/com_dotnet/php_com_dotnet_internal.hWed Feb 4
