[PHP-CVS] cvs: php-src / configure.in /main snprintf.c spprintf.c
helly Tue Oct 21 03:36:44 2003 EDT Modified files: /php-srcconfigure.in /php-src/main snprintf.c spprintf.c Log: Bugfix #25906 Sessions and Framesets Index: php-src/configure.in diff -u php-src/configure.in:1.470 php-src/configure.in:1.471 --- php-src/configure.in:1.470 Fri Oct 17 13:19:43 2003 +++ php-src/configure.inTue Oct 21 03:36:42 2003 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.470 2003/10/17 17:19:43 helly Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.471 2003/10/21 07:36:42 helly Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -368,7 +368,8 @@ utime.h \ sys/utsname.h \ sys/ipc.h \ -dlfcn.h +dlfcn.h \ +inttypes.h ],[],[],[ #ifdef HAVE_SYS_PARAM_H #include @@ -1174,7 +1175,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_iterators.c zend_interfaces.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 \ Index: php-src/main/snprintf.c diff -u php-src/main/snprintf.c:1.31 php-src/main/snprintf.c:1.32 --- php-src/main/snprintf.c:1.31Mon Sep 29 19:44:07 2003 +++ php-src/main/snprintf.c Tue Oct 21 03:36:43 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: snprintf.c,v 1.31 2003/09/29 23:44:07 iliaa Exp $ */ +/* $Id: snprintf.c,v 1.32 2003/10/21 07:36:43 helly Exp $ */ /* * Copyright (c) 1995-1998 The Apache Group. All rights reserved. @@ -83,6 +83,9 @@ #include #include #include +#ifdef HAVE_INTTYPES_H +#include +#endif #define FALSE 0 #define TRUE 1 Index: php-src/main/spprintf.c diff -u php-src/main/spprintf.c:1.20 php-src/main/spprintf.c:1.21 --- php-src/main/spprintf.c:1.20Sun Sep 28 21:07:55 2003 +++ php-src/main/spprintf.c Tue Oct 21 03:36:43 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: spprintf.c,v 1.20 2003/09/29 01:07:55 iliaa Exp $ */ +/* $Id: spprintf.c,v 1.21 2003/10/21 07:36:43 helly Exp $ */ /* This is the spprintf implementation. * It has emerged from apache snprintf. See original header: @@ -87,6 +87,9 @@ #include #include #include +#ifdef HAVE_INTTYPES_H +#include +#endif #include "snprintf.h" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / configure.in /main snprintf.c spprintf.c
Hello Marcus, Tuesday, October 21, 2003, 9:36:44 AM, you wrote: > helly Tue Oct 21 03:36:44 2003 EDT > Modified files: > /php-src configure.in > /php-src/main snprintf.c spprintf.c > Log: > Bugfix #25906 Sessions and Framesets Sorry wrong comment. Correct would be #25930 Can't compile snprintf.c [...] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
helly Tue Oct 21 04:29:23 2003 EDT Modified files: /php-srcconfigure.in Log: We don't have this yet Index: php-src/configure.in diff -u php-src/configure.in:1.471 php-src/configure.in:1.472 --- php-src/configure.in:1.471 Tue Oct 21 03:36:42 2003 +++ php-src/configure.inTue Oct 21 04:29:22 2003 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.471 2003/10/21 07:36:42 helly Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.472 2003/10/21 08:29:22 helly Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1175,7 +1175,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) 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 /sapi/apache2handler config.m4 mod_php5.c php4apache2.dsp php_apache.h sapi_apache2.c
sniper Tue Oct 21 07:48:32 2003 EDT
Added files:
/php-src/sapi/apache2handlermod_php5.c
Modified files:
/php-src/sapi/apache2handlerconfig.m4 php4apache2.dsp php_apache.h
sapi_apache2.c
Log:
Fixed bug #25768
Index: php-src/sapi/apache2handler/config.m4
diff -u php-src/sapi/apache2handler/config.m4:1.8
php-src/sapi/apache2handler/config.m4:1.9
--- php-src/sapi/apache2handler/config.m4:1.8 Wed Jul 16 01:46:36 2003
+++ php-src/sapi/apache2handler/config.m4 Tue Oct 21 07:48:31 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.8 2003/07/16 05:46:36 sniper Exp $
+dnl $Id: config.m4,v 1.9 2003/10/21 11:48:31 sniper Exp $
dnl
AC_MSG_CHECKING(for Apache 2.0 handler-module support via DSO through APXS)
@@ -75,7 +75,7 @@
case $host_alias in
*aix*)
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp"
-PHP_SELECT_SAPI(apache2handler, shared, sapi_apache2.c apache_config.c
php_functions.c, $APACHE_CFLAGS)
+PHP_SELECT_SAPI(apache2handler, shared, mod_php5.c sapi_apache2.c apache_config.c
php_functions.c, $APACHE_CFLAGS)
INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
;;
*darwin*)
@@ -91,7 +91,7 @@
fi
MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD $MH_BUNDLE_FLAGS"
PHP_SUBST(MH_BUNDLE_FLAGS)
-PHP_SELECT_SAPI(apache2handler, bundle, sapi_apache2.c apache_config.c
php_functions.c, $APACHE_CFLAGS)
+PHP_SELECT_SAPI(apache2handler, bundle, mod_php5.c sapi_apache2.c apache_config.c
php_functions.c, $APACHE_CFLAGS)
SAPI_SHARED=libs/libphp5.so
INSTALL_IT="$INSTALL_IT $SAPI_SHARED"
;;
@@ -99,11 +99,11 @@
if test -f _APP_; then `rm _APP_`; fi
`ln -s $APXS_BINDIR/httpd _APP_`
EXTRA_LIBS="$EXTRA_LIBS _APP_"
-PHP_SELECT_SAPI(apache2handler, shared, sapi_apache2.c apache_config.c
php_functions.c, $APACHE_CFLAGS)
+PHP_SELECT_SAPI(apache2handler, shared, mod_php5.c sapi_apache2.c apache_config.c
php_functions.c, $APACHE_CFLAGS)
INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
;;
*)
-PHP_SELECT_SAPI(apache2handler, shared, sapi_apache2.c apache_config.c
php_functions.c, $APACHE_CFLAGS)
+PHP_SELECT_SAPI(apache2handler, shared, mod_php5.c sapi_apache2.c apache_config.c
php_functions.c, $APACHE_CFLAGS)
INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
;;
esac
Index: php-src/sapi/apache2handler/php4apache2.dsp
diff -u php-src/sapi/apache2handler/php4apache2.dsp:1.2
php-src/sapi/apache2handler/php4apache2.dsp:1.3
--- php-src/sapi/apache2handler/php4apache2.dsp:1.2 Tue Mar 25 06:50:18 2003
+++ php-src/sapi/apache2handler/php4apache2.dsp Tue Oct 21 07:48:31 2003
@@ -123,6 +123,10 @@
# End Source File
# Begin Source File
+SOURCE=.\mod_php5.c
+# End Source File
+# Begin Source File
+
SOURCE=.\php_functions.c
# End Source File
# Begin Source File
Index: php-src/sapi/apache2handler/php_apache.h
diff -u php-src/sapi/apache2handler/php_apache.h:1.5
php-src/sapi/apache2handler/php_apache.h:1.6
--- php-src/sapi/apache2handler/php_apache.h:1.5Tue Jun 10 16:03:44 2003
+++ php-src/sapi/apache2handler/php_apache.hTue Oct 21 07:48:31 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_apache.h,v 1.5 2003/06/10 20:03:44 imajes Exp $ */
+/* $Id: php_apache.h,v 1.6 2003/10/21 11:48:31 sniper Exp $ */
#ifndef PHP_APACHE_H
#define PHP_APACHE_H
@@ -51,6 +51,7 @@
char *get_php_config(void *conf, char *name, size_t name_len);
void apply_config(void *);
extern const command_rec php_dir_cmds[];
+void php_ap2_register_hook(apr_pool_t *p);
#define APR_ARRAY_FOREACH_OPEN(arr, key, val) \
{
\
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.28
php-src/sapi/apache2handler/sapi_apache2.c:1.29
--- php-src/sapi/apache2handler/sapi_apache2.c:1.28 Wed Oct 1 23:24:36 2003
+++ php-src/sapi/apache2handler/sapi_apache2.c Tue Oct 21 07:48:31 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: sapi_apache2.c,v 1.28 2003/10/02 03:24:36 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.29 2003/10/21 11:48:31 sniper Exp $ */
#include
@@ -61,7 +61,7 @@
#define PHP_MAGIC_TYPE "application/x-httpd-php"
#define PHP_SOURCE_MAGIC_TYPE "application/x-httpd-php-source"
-#define PHP_SCRIPT "php-script"
+#define PHP_SCRIPT "php5-script"
/* A way to specify the location of the php.ini dir in an apache directive */
char *apache2_php_ini_path_override = NULL;
@@ -564,22 +564,12 @@
return OK;
}
-static void php_register_hook(apr_pool_t *p)
+void php_ap2_register_hook(apr_pool_t *p)
{
ap_hook_pre_config(php_pre_config, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_post_config
[PHP-CVS] cvs: CVSROOT / avail
sas Tue Oct 21 12:51:42 2003 EDT Modified files: /CVSROOTavail Log: phpdoc karma for fd Index: CVSROOT/avail diff -u CVSROOT/avail:1.765 CVSROOT/avail:1.766 --- CVSROOT/avail:1.765 Sun Oct 19 22:02:27 2003 +++ CVSROOT/avail Tue Oct 21 12:51:41 2003 @@ -26,7 +26,7 @@ # The PHP Documentation Group maintains the documentation and its # translations. -avail|frogger,coldocean,alan_k,fleaslob,torben,lynch,kk,ted,paul,mbritton,coar,joey,bibi,mrobinso,perugini,tzwenny,hirokawa,drews,paulsen,hartmann,leon,jonen,tschuer,tfromm,manuel,stas,danbeck,sli,jmcastagnetto,mohrt,goba,samesch,jon,soneca,ronabop,glace,latoserver,rafael,jan,jcmeloni,chrullrich,mk,sebastian,troels,mathieu,phaethon,mj,corean,pandach,cycle98,vizvil,regina,cynic,jpm,dams,karoora,pcraft,suvia,zak,zimt,jmoore,ftfuture,ag315,bbonev,afortaleza,neotron,cg,delrom,jkj,hellekin,kgergely,cnewbill,fuzzy74,bjoern,fams,smasiello,dim,lucasr,cpereira,ernani,theseer,noribsd,subjective,ufux,hadar_p,asautins,dbenson,aleczapka,tom,amiller,cortesi,rarruda,betz,philip,alindeman,thyla,cucinato,zyprexia,tpug,mitja,conni,sts,georg,nmav,subbie,leszek,spheroid,slawek,alan_dangelo,ae,nohn,kaser01,visualmind,kurtz,luk,tronic,moh,bernd,yohgaki,fujimoto,gerzson,webler,spooky,cece,daniel,boo,nhoizey,joerg,imajes,hakan,chief977,shlomi,raful,yuval,tomer,barak,ido,mork,lior,gal,adiju,cr_depend,florian,kappu,muricaru,dt,critix,ck,costra,fancao0515,tibee,eriksson,wenz,bs,anderson,tal,sander,matroz,ave,adu,mmeier,wentzel,scaro,aspinei,lmaxcar,manuzhai,darvina,peter,maxim,romakhin,n0nick,attila,sagi,kai,microbrain,rhheo,shimi,k.schroeder,djworld,emil,lboshell,netholic,dmitry83,progcom,verdana,yincheng,surfmax,nicos,chregu,msopacua,bbd,cyril,gregory,hudzilla,klean,mignoni,wiesemann,xqi,mersal,zruya,sean,staybyte,aber_sabeel,alzahrani,thomaslio,sfox,jippie,antonio,ahxiao,akcakayaa,allhibi,aner,black,class007,digo,dima,dorons,eshare,hpop1,itay,juppie,mrmatrix,saad,thomasgm,xbite,tobsn,jome,analytik,outsider,heymarcel,asmodean,bader,elmaystro,sp,truelight,gnuhacker,_batman_,sachat,dallas,dejan,zer0fill,steve3d,lm92,bradmssw,tahani,victor,erica,simonh,phpman,mrphp,notarius,joseph,mmkhajah,mohammed,proton,klootz,takashima,leoca,ahmad,abobader,fboudot,wurm,hakawy,felix,ahmedss,mahrous2020,yorgo,gal_ga,abodive,ama,andras,hassen,jkhdk,okamura,popov,xman,fernandoc,avenger,hwin,tix,alrehawi_,liuming,ramysaweres,astone,shiflett,jaenecke,bdensley,adamchan,jingfs,murphy,potatotsang,the_q,jsheets,xelis,equerci,phpcatala,tofanini,umut,kriga,ray,royhuggins,logician,almanar,alexws,gonik,haiaw,lkwang_cn,shadowwulf,telecart,pongsakorn,naveed,shivas,tularis,angela,decorj,hitcho,kevinkee,nmee,thx1140,crotalus,didou,novotnyr,sil,traduim,gui,mgf,ivanr,michal,tsirman,momo,cysoft,firefox,kouber,mipac,muslem,tomysk,vemarkov,garth,lord_lele,stone,laacz,tony2001,retnug,ernestyang,hatem,house,luisdaniel,nizar,nvivo,seth,tomh,danguer,adam,nio,wassago,beeven,colacino,zvaranka,cesarguru,chubu,dark2907,portoban,reven,wizzard,sywr,koendw83,rylin,webstudio,jsjohnst,dmanusset,et,pitiphan,mbr,cdalar,alrashoudi,hafid,enough,zhouhao007,jnorbi,lorenzohgh,denisr,coder03,jcclaros,thomas,freeman,rioter,jschultz,davey,belleto,jtacon,yuw,ohill,elfyn,noam,nathan,salman,cheezy,ene,rezaiqbal,purnomo,dufiga_php,ftp_geo,udhien,prio,luckyguy354,maf,handi,meme,satiri,maddankara,rildo,hd,ali,lpj,adhitama,engkongs,preilly,dave,marcelo,curt|phpdoc,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-de,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-el,phpdoc-id +avail|frogger,coldocean,alan_k,fleaslob,torben,lynch,kk,ted,paul,mbritton,coar,joey,bibi,mrobinso,perugini,tzwenny,hirokawa,drews,paulsen,hartmann,leon,jonen,tschuer,tfromm,manuel,stas,danbeck,sli,jmcastagnetto,mohrt,goba,samesch,jon,soneca,ronabop,glace,latoserver,rafael,jan,jcmeloni,chrullrich,mk,sebastian,troels,mathieu,phaethon,mj,corean,pandach,cycle98,vizvil,regina,cynic,jpm,dams,karoora,pcraft,suvia,zak,zimt,jmoore,ftfuture,ag315,bbonev,afortaleza,neotron,cg,delrom,jkj,hellekin,kgergely,cnewbill,fuzzy74,bjoern,fams,smasiello,dim,lucasr,cpereira,ernani,theseer,noribsd,subjective,ufux,hadar_p,asautins,dbenson,aleczapka,tom,amiller,cortesi,rarruda,betz,philip,alindeman,thyla,cucinato,zyprexia,tpug,mitja,conni,sts,georg,nmav,subbie,leszek,spheroid,slawek,alan_dangelo,ae,nohn,kaser01,visualmind,kurtz,luk,tronic,moh,bernd,yohgaki,fujimoto,gerzson,webler,spooky,cece,daniel,boo,nhoizey,joerg,imajes,hakan,chief977,shlomi,raful,yuval,tomer,barak,ido,mork,lior,gal,adiju,cr_depend,florian,kappu,muricaru,dt,critix,ck,costra,fancao0515,tibee,eriksson,wenz,bs,anderson,tal,sander,matroz,ave,adu,mmeier,wentzel,scaro,aspinei,lmaxcar,manuzhai,darvina,peter,maxim,romakhin,n0nick,attila,sagi,kai,microbrain,rhheo,shimi,k.schroeder,djworld,emil,lboshell,netholic,dmitry83,progcom,verdana,yinc
[PHP-CVS] cvs: php-src /ext/mbstring mbstring.c
iliaa Tue Oct 21 22:38:48 2003 EDT
Modified files:
/php-src/ext/mbstring mbstring.c
Log:
Fixed compile warnings.
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.200 php-src/ext/mbstring/mbstring.c:1.201
--- php-src/ext/mbstring/mbstring.c:1.200 Thu Oct 2 07:02:54 2003
+++ php-src/ext/mbstring/mbstring.c Tue Oct 21 22:38:47 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.200 2003/10/02 11:02:54 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.201 2003/10/22 02:38:47 iliaa Exp $ */
/*
* PHP4 Multibyte String module "mbstring"
@@ -508,7 +508,7 @@
{
size_t i;
- *plist = php_mb_default_identify_list_neut;
+ *plist = (enum mbfl_no_encoding *) php_mb_default_identify_list_neut;
*plist_size = sizeof(php_mb_default_identify_list_neut) /
sizeof(php_mb_default_identify_list_neut[0]);
for (i = 0; i < sizeof(php_mb_default_identify_list) /
sizeof(php_mb_default_identify_list[0]); i++) {
@@ -731,7 +731,7 @@
MBSTRG(detect_order_list_size) = 0;
MBSTRG(current_detect_order_list) = NULL;
MBSTRG(current_detect_order_list_size) = 0;
- MBSTRG(default_detect_order_list) = php_mb_default_identify_list_neut;
+ MBSTRG(default_detect_order_list) = (enum mbfl_no_encoding *)
php_mb_default_identify_list_neut;
MBSTRG(default_detect_order_list_size) =
sizeof(php_mb_default_identify_list_neut) /
sizeof(php_mb_default_identify_list_neut[0]);
MBSTRG(filter_illegal_mode) = MBFL_OUTPUTFILTER_ILLEGAL_MODE_CHAR;
MBSTRG(filter_illegal_substchar) = 0x3f;/* '?' */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
