[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c
thetaphiSun Aug 3 07:22:53 2003 EDT Modified files: /php-src/sapi/apache2handlersapi_apache2.c Log: Fix Win32 Build because of missint TSRM stuff Index: php-src/sapi/apache2handler/sapi_apache2.c diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.24 php-src/sapi/apache2handler/sapi_apache2.c:1.25 --- php-src/sapi/apache2handler/sapi_apache2.c:1.24 Sat Aug 2 14:29:30 2003 +++ php-src/sapi/apache2handler/sapi_apache2.c Sun Aug 3 07:22:53 2003 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: sapi_apache2.c,v 1.24 2003/08/02 18:29:30 iliaa Exp $ */ +/* $Id: sapi_apache2.c,v 1.25 2003/08/03 11:22:53 thetaphi Exp $ */ #include fcntl.h @@ -243,6 +243,7 @@ apr_bucket_brigade *brigade; apr_bucket *bucket; request_rec *r; + TSRMLS_FETCH(); ctx = server_context; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /sapi/apache2handler sapi_apache2.c
thetaphiSun Aug 3 07:23:25 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/sapi/apache2handlersapi_apache2.c Log: MFH Index: php-src/sapi/apache2handler/sapi_apache2.c diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.19 php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.20 --- php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.19 Sat Aug 2 14:30:21 2003 +++ php-src/sapi/apache2handler/sapi_apache2.c Sun Aug 3 07:23:25 2003 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: sapi_apache2.c,v 1.1.2.19 2003/08/02 18:30:21 iliaa Exp $ */ +/* $Id: sapi_apache2.c,v 1.1.2.20 2003/08/03 11:23:25 thetaphi Exp $ */ #include fcntl.h @@ -248,6 +248,7 @@ apr_bucket_brigade *brigade; apr_bucket *bucket; request_rec *r; + TSRMLS_FETCH(); ctx = server_context; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
sas Sun Aug 3 08:50:31 2003 EDT Modified files: /CVSROOTavail Log: pear karma for heino, vincent Index: CVSROOT/avail diff -u CVSROOT/avail:1.725 CVSROOT/avail:1.726 --- CVSROOT/avail:1.725 Sat Aug 2 22:56:12 2003 +++ CVSROOT/avail Sun Aug 3 08:50:31 2003 @@ -43,9 +43,9 @@ avail|ilia,jalal,zak,andre,lyric,jmoore,ronabop,sebastian,joey,sniper,torben,hellekin,cnewbill,bate,yohgaki,jan,imajes,derick,msopacua,nohn,edink|qaweb # The PEAR Team has access to the full PEAR tree, the PEAR portion of -# the PHP 4 tree, the PEAR website, and the PEAR documentation. +# the PHP tree, the PEAR website, and the PEAR documentation. -avail|andrew,moh,sterling,jon,jlp,sebastian,troels,urs,jpm,adaniel,tuupola,mj,metallic,richard,aj,andre,zimt,uw,bjoern,chregu,tfromm,subjective,cox,jmcastagnetto,kaltoft,jccann,amiller,mansion,zyprexia,alexmerz,yavo,clambert,vblavet,bernd,nohn,mog,mfischer,kvn,jan,eru,murahachibu,hayk,cain,nhoizey,aditus,ludoo,imajes,graeme,eriksson,jasonlotito,dallen,lsmith,timmyg,pajoye,artka,tal,kk,cmv,rashid,alexios,baba,reywob,ekilfoil,antonio,sagi,jrust,mehl,dickmann,alan_k,fab,thku,busterb,miked,pgc,ctrlsoft,tychay,dexter,sachat,svenasse,mw21st,arahn,matthias,dias,jfbus,derick,chief,sigi,tony,olivier,nepto,voyteck,cnb,dams,peterk,ernani,edink,quipo,egnited,arnaud,mcmontero,mbretter,nicos,philip,xnoguer,sjr,meebey,jellybob,darkelder,max,dcowgill,daggilli,kuboa,ncowham,sklar,krausbn,ordnas,avb,polone,datenpunk,inorm,llucax,davey,moosh,et,mscifo,yunosh,thesaur,hburbach,ohill,cellog,hlellelid,rmcclain|pear,peardoc +avail|andrew,moh,sterling,jon,jlp,sebastian,troels,urs,jpm,adaniel,tuupola,mj,metallic,richard,aj,andre,zimt,uw,bjoern,chregu,tfromm,subjective,cox,jmcastagnetto,kaltoft,jccann,amiller,mansion,zyprexia,alexmerz,yavo,clambert,vblavet,bernd,nohn,mog,mfischer,kvn,jan,eru,murahachibu,hayk,cain,nhoizey,aditus,ludoo,imajes,graeme,eriksson,jasonlotito,dallen,lsmith,timmyg,pajoye,artka,tal,kk,cmv,rashid,alexios,baba,reywob,ekilfoil,antonio,sagi,jrust,mehl,dickmann,alan_k,fab,thku,busterb,miked,pgc,ctrlsoft,tychay,dexter,sachat,svenasse,mw21st,arahn,matthias,dias,jfbus,derick,chief,sigi,tony,olivier,nepto,voyteck,cnb,dams,peterk,ernani,edink,quipo,egnited,arnaud,mcmontero,mbretter,nicos,philip,xnoguer,sjr,meebey,jellybob,darkelder,max,dcowgill,daggilli,kuboa,ncowham,sklar,krausbn,ordnas,avb,polone,datenpunk,inorm,llucax,davey,moosh,et,mscifo,yunosh,thesaur,hburbach,ohill,cellog,hlellelid,rmcclain,vincent,heino|pear,peardoc avail|cox,mj,vblavet,dickmann,tal,pajoye,jmcastagnetto,alexmerz|php-src/pear avail|alan_k,chagenbu,cmv,cox,derick,dickmann,jon,mj,pajoye,richard,tal,antonio,alexmerz|pearweb -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mbstring/tests mb_http_input.phpt
moriyoshi Sun Aug 3 09:58:20 2003 EDT
Modified files:
/php-src/ext/mbstring/tests mb_http_input.phpt
Log:
Disable the test temporarily because -d flags in the command line doesn't
take effect under CGI mode. (See the relevant portion of cgi_main.c
that begins at line 996)
Index: php-src/ext/mbstring/tests/mb_http_input.phpt
diff -u php-src/ext/mbstring/tests/mb_http_input.phpt:1.2
php-src/ext/mbstring/tests/mb_http_input.phpt:1.3
--- php-src/ext/mbstring/tests/mb_http_input.phpt:1.2 Wed Oct 30 03:06:52 2002
+++ php-src/ext/mbstring/tests/mb_http_input.phpt Sun Aug 3 09:58:20 2003
@@ -4,6 +4,7 @@
?php
extension_loaded('mbstring') or die('skip mbstring not available');
(php_sapi_name()=='cgi') or die(skip sapi is not a cgi version);
+die(skip disabled temporarily);
?
--POST--
a=ÆüËܸì0123456789ÆüËܸ쥫¥¿¥«¥Ê¤Ò¤é¤¬¤Ê
--
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/mbstring/tests mb_http_input.phpt
moriyoshi Sun Aug 3 09:59:48 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mbstring/tests mb_http_input.phpt
Log:
MFH(r-1.3): disable the test temporarily because -d flags in the command
line doesn't take effect under CGI mode. (See the relevant portion of
cgi_main.c that begins at line 996)
Index: php-src/ext/mbstring/tests/mb_http_input.phpt
diff -u php-src/ext/mbstring/tests/mb_http_input.phpt:1.2
php-src/ext/mbstring/tests/mb_http_input.phpt:1.2.2.1
--- php-src/ext/mbstring/tests/mb_http_input.phpt:1.2 Wed Oct 30 03:06:52 2002
+++ php-src/ext/mbstring/tests/mb_http_input.phpt Sun Aug 3 09:59:48 2003
@@ -4,6 +4,7 @@
?php
extension_loaded('mbstring') or die('skip mbstring not available');
(php_sapi_name()=='cgi') or die(skip sapi is not a cgi version);
+die(skip disabled temporarily);
?
--POST--
a=ÆüËܸì0123456789ÆüËܸ쥫¥¿¥«¥Ê¤Ò¤é¤¬¤Ê
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main php.h
zeevSun Aug 3 13:42:01 2003 EDT Modified files: /php-src/main php.h Log: Remove unnecessary macro Index: php-src/main/php.h diff -u php-src/main/php.h:1.190 php-src/main/php.h:1.191 --- php-src/main/php.h:1.190Fri Jun 27 03:43:42 2003 +++ php-src/main/php.h Sun Aug 3 13:42:01 2003 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php.h,v 1.190 2003/06/27 07:43:42 sas Exp $ */ +/* $Id: php.h,v 1.191 2003/08/03 17:42:01 zeev Exp $ */ #ifndef PHP_H #define PHP_H @@ -322,7 +322,6 @@ #define PHP_NAMED_FE ZEND_NAMED_FE #define PHP_FE ZEND_FE #define PHP_FALIAS ZEND_FALIAS -#define PHP_STATIC_FE ZEND_STATIC_FE #define PHP_ME ZEND_ME #define PHP_MODULE_STARTUP_N ZEND_MODULE_STARTUP_N -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl interface.c /ext/exif exif.c /ext/gmp gmp.c /ext/ldap ldap.c /ext/mbstring mbstring.c /ext/mcve mcve.c /ext/mssql php_mssql.c /ext/mysqli mysqli_fe.c /ext/ncurses ncurses_fe.c /ext/oci8 oci8.c /ext/odbc php_odbc.c /ext/openssl openssl.c /ext/oracle oracle.c /ext/simplexml simplexml.c /ext/sockets sockets.c /ext/sqlite sqlite.c /ext/standard basic_functions.c /ext/sysvmsg sysvmsg.c /ext/xml xml.c /ext/xmlrpc xmlrpc-epi-php.c /ext/yaz php_yaz.c
zeevSun Aug 3 13:44:39 2003 EDT
Modified files:
/php-src/ext/curl interface.c
/php-src/ext/exif exif.c
/php-src/ext/gmpgmp.c
/php-src/ext/ldap ldap.c
/php-src/ext/mbstring mbstring.c
/php-src/ext/mcve mcve.c
/php-src/ext/mssql php_mssql.c
/php-src/ext/mysqli mysqli_fe.c
/php-src/ext/ncursesncurses_fe.c
/php-src/ext/oci8 oci8.c
/php-src/ext/odbc php_odbc.c
/php-src/ext/opensslopenssl.c
/php-src/ext/oracle oracle.c
/php-src/ext/simplexml simplexml.c
/php-src/ext/socketssockets.c
/php-src/ext/sqlite sqlite.c
/php-src/ext/standard basic_functions.c
/php-src/ext/sysvmsgsysvmsg.c
/php-src/ext/xmlxml.c
/php-src/ext/xmlrpc xmlrpc-epi-php.c
/php-src/ext/yazphp_yaz.c
Log:
Use new infrastructure.
There are bound to be some messups, please report build/runtime bugs!
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.24 php-src/ext/curl/interface.c:1.25
--- php-src/ext/curl/interface.c:1.24 Sat Jun 28 05:55:12 2003
+++ php-src/ext/curl/interface.cSun Aug 3 13:44:35 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.24 2003/06/28 09:55:12 derick Exp $ */
+/* $Id: interface.c,v 1.25 2003/08/03 17:44:35 zeev Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -55,8 +55,6 @@
#define CAAS(s, v) add_assoc_string_ex(return_value, s, sizeof(s), (char *) v, 1);
#define CAAZ(s, v) add_assoc_zval_ex(return_value, s, sizeof(s), (zval *) v);
-static const unsigned char second_args_force_ref[]= { 2, BYREF_NONE, BYREF_FORCE
};
-
/* {{{ curl_functions[]
*/
function_entry curl_functions[] = {
@@ -72,7 +70,7 @@
PHP_FE(curl_multi_add_handle,NULL)
PHP_FE(curl_multi_remove_handle, NULL)
PHP_FE(curl_multi_select,NULL)
- PHP_FE(curl_multi_exec, second_args_force_ref)
+ PHP_FE(curl_multi_exec, second_arg_force_ref)
PHP_FE(curl_multi_getcontent,NULL)
PHP_FE(curl_multi_info_read, NULL)
PHP_FE(curl_multi_close, NULL)
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.152 php-src/ext/exif/exif.c:1.153
--- php-src/ext/exif/exif.c:1.152 Fri Jun 20 14:24:38 2003
+++ php-src/ext/exif/exif.c Sun Aug 3 13:44:36 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: exif.c,v 1.152 2003/06/20 18:24:38 helly Exp $ */
+/* $Id: exif.c,v 1.153 2003/08/03 17:44:36 zeev Exp $ */
/* ToDos
*
@@ -93,7 +93,10 @@
#define EFREE_IF(ptr) if (ptr) efree(ptr)
-static unsigned char exif_thumbnail_force_ref[] = {2, BYREF_NONE, BYREF_FORCE_REST};
+static
+ZEND_BEGIN_ARG_INFO(exif_thumbnail_force_ref, 1)
+ZEND_END_ARG_INFO();
+
/* {{{ exif_functions[]
*/
@@ -107,7 +110,7 @@
};
/* }}} */
-#define EXIF_VERSION 1.4 $Id: exif.c,v 1.152 2003/06/20 18:24:38 helly Exp $
+#define EXIF_VERSION 1.4 $Id: exif.c,v 1.153 2003/08/03 17:44:36 zeev Exp $
/* {{{ PHP_MINFO_FUNCTION
*/
Index: php-src/ext/gmp/gmp.c
diff -u php-src/ext/gmp/gmp.c:1.33 php-src/ext/gmp/gmp.c:1.34
--- php-src/ext/gmp/gmp.c:1.33 Tue Jun 10 16:03:29 2003
+++ php-src/ext/gmp/gmp.c Sun Aug 3 13:44:36 2003
@@ -35,8 +35,6 @@
/* True global resources - no need for thread safety here */
static int le_gmp;
-static unsigned char first_of_two_force_ref[] = { 2, BYREF_FORCE, BYREF_NONE };
-
/* {{{ gmp_functions[]
*/
function_entry gmp_functions[] = {
@@ -73,8 +71,8 @@
ZEND_FE(gmp_or, NULL)
ZEND_FE(gmp_com,NULL)
ZEND_FE(gmp_xor,NULL)
- ZEND_FE(gmp_setbit, first_of_two_force_ref)
- ZEND_FE(gmp_clrbit, first_of_two_force_ref)
+ ZEND_FE(gmp_setbit, first_arg_force_ref)
+ ZEND_FE(gmp_clrbit, first_arg_force_ref)
ZEND_FE(gmp_scan0, NULL)
ZEND_FE(gmp_scan1, NULL)
ZEND_FE(gmp_popcount, NULL)
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.142 php-src/ext/ldap/ldap.c:1.143
--- php-src/ext/ldap/ldap.c:1.142 Fri Jun 13 09:30:46 2003
+++ php-src/ext/ldap/ldap.c Sun Aug 3 13:44:36 2003
@@ -22,7 +22,7 @@
+--+
*/
-/* $Id: ldap.c,v 1.142 2003/06/13 13:30:46 sniper Exp $ */
+/* $Id: ldap.c,v 1.143 2003/08/03 17:44:36 zeev Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -79,8 +79,15 @@
ZEND_DECLARE_MODULE_GLOBALS(ldap)
-static unsigned char third_argument_force_ref[] = { 3, BYREF_NONE, BYREF_NONE,
BYREF_FORCE };
-static unsigned char arg3to6of6_force_ref[] = { 6, BYREF_NONE, BYREF_NONE,
BYREF_FORCE, BYREF_FORCE, BYREF_FORCE, BYREF_FORCE };
+static
+ ZEND_BEGIN_ARG_INFO(arg3to6of6_force_ref, 0)
+ ZEND_ARG_PASS_INFO(0)
+
[PHP-CVS] cvs: php-src /ext/mbstring mbstring.c php_mbregex.h
helly Sun Aug 3 14:46:34 2003 EDT Modified files: /php-src/ext/mbstring mbstring.c php_mbregex.h Log: Reallow build Index: php-src/ext/mbstring/mbstring.c diff -u php-src/ext/mbstring/mbstring.c:1.180 php-src/ext/mbstring/mbstring.c:1.181 --- php-src/ext/mbstring/mbstring.c:1.180 Sun Aug 3 13:44:36 2003 +++ php-src/ext/mbstring/mbstring.c Sun Aug 3 14:46:34 2003 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: mbstring.c,v 1.180 2003/08/03 17:44:36 zeev Exp $ */ +/* $Id: mbstring.c,v 1.181 2003/08/03 18:46:34 helly Exp $ */ /* * PHP4 Multibyte String module mbstring @@ -197,7 +197,7 @@ PHP_FE(mb_http_output, NULL) PHP_FE(mb_detect_order, NULL) PHP_FE(mb_substitute_character, NULL) - PHP_FE(mb_parse_str,(unsigned char *)second_arg_force_ref) + PHP_FE(mb_parse_str,second_arg_force_ref) PHP_FE(mb_output_handler, NULL) PHP_FE(mb_preferred_mime_name, NULL) PHP_FE(mb_strlen, NULL) @@ -213,7 +213,7 @@ PHP_FE(mb_convert_kana, NULL) PHP_FE(mb_encode_mimeheader,NULL) PHP_FE(mb_decode_mimeheader,NULL) - PHP_FE(mb_convert_variables,(unsigned char *)third_and_rest_force_ref) + PHP_FE(mb_convert_variables,third_and_rest_force_ref) PHP_FE(mb_encode_numericentity, NULL) PHP_FE(mb_decode_numericentity, NULL) PHP_FE(mb_send_mail,NULL) Index: php-src/ext/mbstring/php_mbregex.h diff -u php-src/ext/mbstring/php_mbregex.h:1.7 php-src/ext/mbstring/php_mbregex.h:1.8 --- php-src/ext/mbstring/php_mbregex.h:1.7 Tue Jun 10 16:03:31 2003 +++ php-src/ext/mbstring/php_mbregex.h Sun Aug 3 14:46:34 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_mbregex.h,v 1.7 2003/06/10 20:03:31 imajes Exp $ */ +/* $Id: php_mbregex.h,v 1.8 2003/08/03 18:46:34 helly Exp $ */ #ifndef _PHP_MBREGEX_H #define _PHP_MBREGEX_H @@ -44,8 +44,8 @@ #define PHP_MBREGEX_FUNCTION_ENTRIES \ PHP_FE(mb_regex_encoding, NULL) \ PHP_FE(mb_regex_set_options,NULL) \ - PHP_FE(mb_ereg, (unsigned char *)third_argument_force_ref) \ - PHP_FE(mb_eregi,(unsigned char *)third_argument_force_ref) \ + PHP_FE(mb_ereg, third_arg_force_ref) \ + PHP_FE(mb_eregi,third_arg_force_ref) \ PHP_FE(mb_ereg_replace, NULL) \ PHP_FE(mb_eregi_replace,NULL) \ PHP_FE(mb_split,NULL) \ -- 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
helly Sun Aug 3 14:51:26 2003 EDT
Modified files:
/php-src/ext/mysqli mysqli_fe.c
Log:
Fix build
Index: php-src/ext/mysqli/mysqli_fe.c
diff -u php-src/ext/mysqli/mysqli_fe.c:1.17 php-src/ext/mysqli/mysqli_fe.c:1.18
--- php-src/ext/mysqli/mysqli_fe.c:1.17 Sun Aug 3 13:44:36 2003
+++ php-src/ext/mysqli/mysqli_fe.c Sun Aug 3 14:51:26 2003
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_fe.c,v 1.17 2003/08/03 17:44:36 zeev Exp $
+ $Id: mysqli_fe.c,v 1.18 2003/08/03 18:51:26 helly Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -237,7 +237,7 @@
function_entry mysqli_stmt_methods[] = {
PHP_FALIAS(affected_rows,mysqli_stmt_affected_rows,NULL)
PHP_FALIAS(bind_param,mysqli_bind_param,second_arg_force_by_ref_rest)
- PHP_FALIAS(bind_result,mysqli_bind_result, all_args_force_ref)
+ PHP_FALIAS(bind_result,mysqli_bind_result, all_args_by_ref)
PHP_FALIAS(execute,mysqli_execute,NULL)
PHP_FALIAS(fetch,mysqli_fetch,NULL)
PHP_FALIAS(param_count,mysqli_param_count,NULL)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mbstring mbstring.c
helly Sun Aug 3 14:52:09 2003 EDT Modified files: /php-src/ext/mbstring mbstring.c Log: Fix warning Index: php-src/ext/mbstring/mbstring.c diff -u php-src/ext/mbstring/mbstring.c:1.181 php-src/ext/mbstring/mbstring.c:1.182 --- php-src/ext/mbstring/mbstring.c:1.181 Sun Aug 3 14:46:34 2003 +++ php-src/ext/mbstring/mbstring.c Sun Aug 3 14:52:09 2003 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: mbstring.c,v 1.181 2003/08/03 18:46:34 helly Exp $ */ +/* $Id: mbstring.c,v 1.182 2003/08/03 18:52:09 helly Exp $ */ /* * PHP4 Multibyte String module mbstring @@ -144,7 +144,7 @@ static const int php_mb_default_identify_list_size = sizeof(php_mb_default_identify_list)/sizeof(enum mbfl_no_encoding); /* }}} */ -static const +static ZEND_BEGIN_ARG_INFO(third_and_rest_force_ref, 1) ZEND_ARG_PASS_INFO(0) ZEND_ARG_PASS_INFO(0) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sockets sockets.c
helly Sun Aug 3 14:55:51 2003 EDT Modified files: /php-src/ext/socketssockets.c Log: Fix build Index: php-src/ext/sockets/sockets.c diff -u php-src/ext/sockets/sockets.c:1.148 php-src/ext/sockets/sockets.c:1.149 --- php-src/ext/sockets/sockets.c:1.148 Sun Aug 3 13:44:37 2003 +++ php-src/ext/sockets/sockets.c Sun Aug 3 14:55:51 2003 @@ -19,7 +19,7 @@ +--+ */ -/* $Id: sockets.c,v 1.148 2003/08/03 17:44:37 zeev Exp $ */ +/* $Id: sockets.c,v 1.149 2003/08/03 18:55:51 helly Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -110,7 +110,7 @@ ZEND_ARG_PASS_INFO(1) ZEND_END_ARG_INFO(); -static unsigned char second_fifth_and_sixth_args_force_ref[] = +static ZEND_BEGIN_ARG_INFO(second_fifth_and_sixth_args_force_ref, 0) ZEND_ARG_PASS_INFO(0) ZEND_ARG_PASS_INFO(1) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /sapi/apache2filter sapi_apache2.c
thetaphiSun Aug 3 15:31:14 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/sapi/apache2filter sapi_apache2.c Log: MFH Index: php-src/sapi/apache2filter/sapi_apache2.c diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.91.2.19 php-src/sapi/apache2filter/sapi_apache2.c:1.91.2.20 --- php-src/sapi/apache2filter/sapi_apache2.c:1.91.2.19 Sat Aug 2 14:30:22 2003 +++ php-src/sapi/apache2filter/sapi_apache2.c Sun Aug 3 15:31:13 2003 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: sapi_apache2.c,v 1.91.2.19 2003/08/02 18:30:22 iliaa Exp $ */ +/* $Id: sapi_apache2.c,v 1.91.2.20 2003/08/03 19:31:13 thetaphi Exp $ */ #include fcntl.h @@ -229,6 +229,7 @@ apr_bucket_alloc_t *ba; apr_bucket *b; ap_filter_t *f; /* output filters */ + TSRMLS_FETCH(); ctx = server_context; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache2filter sapi_apache2.c
thetaphiSun Aug 3 15:31:56 2003 EDT Modified files: /php-src/sapi/apache2filter sapi_apache2.c Log: TSRM issue in windows compiling Index: php-src/sapi/apache2filter/sapi_apache2.c diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.118 php-src/sapi/apache2filter/sapi_apache2.c:1.119 --- php-src/sapi/apache2filter/sapi_apache2.c:1.118 Sat Aug 2 14:29:30 2003 +++ php-src/sapi/apache2filter/sapi_apache2.c Sun Aug 3 15:31:56 2003 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: sapi_apache2.c,v 1.118 2003/08/02 18:29:30 iliaa Exp $ */ +/* $Id: sapi_apache2.c,v 1.119 2003/08/03 19:31:56 thetaphi Exp $ */ #include fcntl.h @@ -234,6 +234,7 @@ apr_bucket_alloc_t *ba; apr_bucket *b; ap_filter_t *f; /* output filters */ + TSRMLS_FETCH(); ctx = server_context; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: [PHP-DEV] Re: this causes a segfault cvs: php-src(PHP_4_3) /ext/pcre config.m4 php_pcre.c
On Thu, 10 Jul 2003, Jani Taskinen wrote: Fixed in CVS now. :) What did you fix exactly and where? I don't see it. -Andrei -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: spl / php_spl.c spl_engine.c spl_functions.c spl_functions.h
helly Sun Aug 3 18:29:20 2003 EDT
Modified files:
/splphp_spl.c spl_engine.c spl_functions.c spl_functions.h
Log:
Latest zend updates
Index: spl/php_spl.c
diff -u spl/php_spl.c:1.12 spl/php_spl.c:1.13
--- spl/php_spl.c:1.12 Sat Jul 19 16:54:22 2003
+++ spl/php_spl.c Sun Aug 3 18:29:20 2003
@@ -99,6 +99,58 @@
}
/* }}} */
+PHP_FUNCTION(spl_abstract) {}
+
+#define SPL_ABSTRACT_FE(class, name, arg_info) \
+ { #name, ZEND_FN(spl_abstract), arg_info, sizeof(arg_info)/sizeof(struct
_zend_arg_info)-1, ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC },
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_one_param, 0)
+ ZEND_ARG_PASS_INFO(0)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_two_params, 0)
+ ZEND_ARG_PASS_INFO(0)
+ ZEND_ARG_PASS_INFO(0)
+ZEND_END_ARG_INFO();
+
+function_entry spl_funcs_iterator[] = {
+ SPL_ABSTRACT_FE(iterator, new_iterator, NULL)
+ {NULL, NULL, NULL}
+};
+
+function_entry spl_funcs_forward[] = {
+ SPL_ABSTRACT_FE(forward, current, NULL)
+ SPL_ABSTRACT_FE(forward, next, NULL)
+ SPL_ABSTRACT_FE(forward, has_more, NULL)
+ {NULL, NULL, NULL}
+};
+
+function_entry spl_funcs_sequence[] = {
+ SPL_ABSTRACT_FE(sequence, rewind, NULL)
+ {NULL, NULL, NULL}
+};
+
+function_entry spl_funcs_assoc[] = {
+ SPL_ABSTRACT_FE(assoc, key, NULL)
+ {NULL, NULL, NULL}
+};
+
+function_entry *spl_funcs_forward_assoc = NULL;
+function_entry *spl_funcs_sequence_assoc = NULL;
+
+function_entry spl_funcs_array_read[] = {
+ SPL_ABSTRACT_FE(array_read, get, arginfo_one_param)
+ SPL_ABSTRACT_FE(array_read, exists, arginfo_one_param)
+ {NULL, NULL, NULL}
+};
+
+function_entry spl_funcs_array_access[] = {
+ SPL_ABSTRACT_FE(array_access, set, arginfo_two_params)
+ {NULL, NULL, NULL}
+};
+
/* {{{ PHP_MINIT_FUNCTION(spl)
*/
PHP_MINIT_FUNCTION(spl)
@@ -106,19 +158,13 @@
ZEND_INIT_MODULE_GLOBALS(spl, spl_init_globals, NULL);
REGISTER_SPL_INTERFACE(iterator);
- REGISTER_SPL_INTF_FUNC(iterator, new_iterator);
REGISTER_SPL_INTERFACE(forward);
- REGISTER_SPL_INTF_FUNC(forward, current);
- REGISTER_SPL_INTF_FUNC(forward, next);
- REGISTER_SPL_INTF_FUNC(forward, has_more);
REGISTER_SPL_INTERFACE(sequence);
- REGISTER_SPL_INTF_FUNC(sequence, rewind);
REGISTER_SPL_IMPLEMENT(sequence, forward);
REGISTER_SPL_INTERFACE(assoc);
- REGISTER_SPL_INTF_FUNC(assoc, key);
REGISTER_SPL_INTERFACE(forward_assoc);
REGISTER_SPL_IMPLEMENT(forward_assoc, assoc);
@@ -129,12 +175,9 @@
REGISTER_SPL_IMPLEMENT(sequence_assoc, sequence);
REGISTER_SPL_INTERFACE(array_read);
- REGISTER_SPL_INTF_FUNC(array_read, get);
- REGISTER_SPL_INTF_FUNC(array_read, exists);
REGISTER_SPL_INTERFACE(array_access);
REGISTER_SPL_IMPLEMENT(array_access, array_read);
- REGISTER_SPL_INTF_FUNC(array_access, set);
PHP_MINIT(spl_array)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(spl_directory)(INIT_FUNC_ARGS_PASSTHRU);
Index: spl/spl_engine.c
diff -u spl/spl_engine.c:1.10 spl/spl_engine.c:1.11
--- spl/spl_engine.c:1.10 Wed Jul 16 05:48:36 2003
+++ spl/spl_engine.cSun Aug 3 18:29:20 2003
@@ -176,10 +176,9 @@
/* {{{ spl_call_method */
int spl_call_method(zval **object_pp, zend_class_entry *obj_ce, zend_function
**fn_proxy, char *function_name, int fname_len, zval **retval, HashTable *symbol_table
TSRMLS_DC, int param_count, ...)
{
- int i, l;
+ int i;
zval *arg;
zval *param;
- unsigned char *arg_types;
zval **original_return_value;
HashTable *calling_symbol_table;
zend_function_state *original_function_state_ptr;
@@ -219,15 +218,11 @@
va_start(args, param_count);
if (param_count) {
- if ((arg_types = EX(function_state).function-common.arg_types) !=
NULL) {
- l = arg_types[0];
- } else {
- l = 0;
- }
for (i=1; i=param_count; i++) {
arg = va_arg(args, zval*);
- if (i=l arg_types[i]==BYREF_FORCE !PZVAL_IS_REF(arg)) {
+ if (ARG_SHOULD_BE_SENT_BY_REF(EX(function_state).function, i)
+!PZVAL_IS_REF(arg)) {
if (arg-refcount 1) {
zval *new_zval;
Index: spl/spl_functions.c
diff -u spl/spl_functions.c:1.14 spl/spl_functions.c:1.15
--- spl/spl_functions.c:1.14Sat Jul 19 16:54:22 2003
+++ spl/spl_functions.c Sun Aug 3 18:29:20 2003
@@ -35,11 +35,11 @@
/* }}} */
/* {{{ spl_register_interface */
-void spl_register_interface(zend_class_entry ** ppce, char * class_name TSRMLS_DC)
+void spl_register_interface(zend_class_entry ** ppce, char * class_name,
[PHP-CVS] Re: [PHP-DEV] Re: this causes a segfault cvs: php-src(PHP_4_3) /ext/pcreconfig.m4 php_pcre.c
He added a decleration for pcre_* in the wrappers eg. #define pcre_x php_pcre_ as apache2 uses pcre internally As far as I could tell though it still segfauts after that change... - although not had a chance to test it recently.. Regards Alan Andrei Zmievski wrote: On Thu, 10 Jul 2003, Jani Taskinen wrote: Fixed in CVS now. :) What did you fix exactly and where? I don't see it. -Andrei -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
