[PHP-CVS-DAILY] cvs: php4 / ChangeLog
changelog Wed Feb 19 20:32:49 2003 EDT Modified files: /php4 ChangeLog Log: ChangeLog update Index: php4/ChangeLog diff -u php4/ChangeLog:1.1271 php4/ChangeLog:1.1272 --- php4/ChangeLog:1.1271 Tue Feb 18 20:31:58 2003 +++ php4/ChangeLog Wed Feb 19 20:32:48 2003 @@ -1,3 +1,222 @@ +2003-02-19 Jon Parise [EMAIL PROTECTED] + +* ext/rpc/skeleton/php_skeleton.h + ext/rpc/skeleton/skeleton.c + ext/rpc/skeleton/skeleton.h: + Add folding markers and editor directive blocks. + +2003-02-19 Rasmus Lerdorf [EMAIL PROTECTED] + +* ext/mbstring/mb_gpc.c + ext/mbstring/mb_gpc.h: + Fix mbstring input_filter + +* README.input_filter + ext/mbstring/mb_gpc.c + ext/mbstring/mbstring.c + main/SAPI.c + main/SAPI.h + main/php_content_types.c + main/php_variables.c + main/rfc1867.c: + Input Filter support. See README.input_filter for details. + +2003-02-19 Jani Taskinen [EMAIL PROTECTED] + +* main/php_scandir.c + main/php_scandir.h: + MFB + +* (PHP_4_3) + main/php_scandir.c + main/php_scandir.h: + dirent.h needs to be included always. + +2003-02-19 Harald Radi [EMAIL PROTECTED] + +* main/main.c: + prevent xdebug from crashing + +2003-02-19 Hartmut Holzgraefe [EMAIL PROTECTED] + +* scripts/ext_skel_ng/extension.xml + scripts/ext_skel_ng/extension_parser.php + scripts/ext_skel_ng/php_function.php: + code for the special functions MINIT, MSHUTDOWN, RINIT, RSHUTDOWN, MINFO + and for private internal C helper functions may now be embedded into + the XML specification + +2003-02-19 Wez Furlong [EMAIL PROTECTED] + +* NEWS: + typo.. + +* NEWS: + News about the ZE stream thing + +2003-02-19 Hartmut Holzgraefe [EMAIL PROTECTED] + +* scripts/ext_skel_ng/extension.xml: + test specifications for MINIT and friends + +* scripts/ext_skel_ng/extension.dtd: + code inside function was supported but missing from the DTD, + added role attribute to support internal functions like + MINIT and stuff, private C functions not to be published as + PHP functions and public implemenations of PHP functions + +2003-02-19 Marc Boeren [EMAIL PROTECTED] + +* ext/dbx/dbx_pgsql.c: + Fix for bug #1: pgsql version for dbx_query suppressed a warning that + was trappable by using a user-defined error-handler. A different use of + pgsql_getrow removed the warning and thus the need for suppressing it. + +2003-02-19 Harald Radi [EMAIL PROTECTED] + +* (PHP_4_3) + win32/php5ts.dsw: + remove php5ts workspace from PHP_4_3 branch + +2003-02-19 Sascha Schumann [EMAIL PROTECTED] + +* sapi/thttpd/README + sapi/thttpd/README + sapi/thttpd/README: + some improvements + +2003-02-19 Hartmut Holzgraefe [EMAIL PROTECTED] + +* scripts/ext_skel_ng/ext_skel_ng.php + scripts/ext_skel_ng/extension_parser.php + scripts/ext_skel_ng/php_function.php: + Microsoft Developer Studio project file (.dsp) generation added + + for now both config.m4 and .dsp files are generated for the simples + case only (one .c file, one .h file, no external dependencies) + +* scripts/ext_skel_ng/README + scripts/ext_skel_ng/ext_skel_ng.php + scripts/ext_skel_ng/extension.dtd + scripts/ext_skel_ng/extension.xml + scripts/ext_skel_ng/extension_parser.php + scripts/ext_skel_ng/php_constant.php + scripts/ext_skel_ng/php_element.php + scripts/ext_skel_ng/php_function.php + scripts/ext_skel_ng/xml_stream_callback_parser.php + scripts/ext_skel_ng/xml_stream_parser.php: + next generation ext_skel script - initial checkin + +2003-02-19 Corne' Cornelius [EMAIL PROTECTED] + +* ext/informix/ifx.ec: + - Revert latest commit + +2003-02-19 Jani Taskinen [EMAIL PROTECTED] + +* main/php_ini.c: + ws/style fixes + +2003-02-19 Corne' Cornelius [EMAIL PROTECTED] + +* ext/informix/ifx.ec: + - Added Input Descriptor Binding to be used by blobs. This fixed a bug +where ESQL/C would cause a Segmentation fault if the first blob in a +result is NULL or '' as soon as it gets a result with blob != NULL + - Fixed leaks where blobs resources weren't always freed + +2003-02-19 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_4_3) + main/php_ini.c + main/php_scandir.c + main/php_scandir.h: + MFH: prevent conflicts with other libraries (e.g. libc-client) + +* ext/standard/dir.c: + scandir - php_scandir, alphasort - php_alphasort + +* main/php_ini.c + main/php_scandir.c + main/php_scandir.h: + Fix the possible conflicts with other libs (like libc-client) + +* main/SAPI.h + main/alloca.c + main/config.nw.h + main/fopen_wrappers.c + main/fopen_wrappers.h + main/internal_functions.c.in +
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Wed Feb 19 20:33:01 2003 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.177 ZendEngine2/ChangeLog:1.178 --- ZendEngine2/ChangeLog:1.177 Tue Feb 18 20:32:10 2003 +++ ZendEngine2/ChangeLog Wed Feb 19 20:33:00 2003 @@ -1,3 +1,8 @@ +2003-02-19 Wez Furlong [EMAIL PROTECTED] + +* zend_stream.c: + Fix stupid mistake that only affected interactive mode. + 2003-02-18 Rasmus Lerdorf [EMAIL PROTECTED] * zend_stream.c: @@ -453,7 +458,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.177 2003/02/19 01:32:10 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.178 2003/02/20 01:33:00 changelog +Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS-DAILY] cvs: php4 / NEWS
changelog Wed Feb 19 20:33:18 2003 EDT Modified files: /php4 NEWS Log: NEWS update Index: php4/NEWS diff -u php4/NEWS:1.1348 php4/NEWS:1.1349 --- php4/NEWS:1.1348Wed Feb 19 10:07:45 2003 +++ php4/NEWS Wed Feb 19 20:33:17 2003 @@ -1,6 +1,8 @@ PHP 4 NEWS ||| ? ? ??? 200?, Version 5.0.0 +- Input Filter support added. See README.input_filter. (Rasmus) +- Updated IFX_VERSION entry to work with new Version output of ESQL/C (Corne') - Moved extensions to PECL (http://pear.php.net/): (James, Tal) . ext/fribidi - Fixed bug #21985 and #22064 (various mb_send_mail() issues). (Moriyoshi)
[PHP-CVS] cvs: php4 /ext/standard dir.c
sniper Wed Feb 19 04:27:29 2003 EDT
Modified files:
/php4/ext/standard dir.c
Log:
scandir - php_scandir, alphasort - php_alphasort
Index: php4/ext/standard/dir.c
diff -u php4/ext/standard/dir.c:1.115 php4/ext/standard/dir.c:1.116
--- php4/ext/standard/dir.c:1.115 Mon Jan 27 20:48:57 2003
+++ php4/ext/standard/dir.c Wed Feb 19 04:27:29 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dir.c,v 1.115 2003/01/28 01:48:57 iliaa Exp $ */
+/* $Id: dir.c,v 1.116 2003/02/19 09:27:29 sniper Exp $ */
/* {{{ includes/startup/misc */
@@ -24,9 +24,10 @@
#include fopen_wrappers.h
#include file.h
#include php_dir.h
+#include php_scandir.h
#ifdef HAVE_DIRENT_H
-# include dirent.h
+#include dirent.h
#endif
#if HAVE_UNISTD_H
@@ -39,9 +40,6 @@
#include win32/readdir.h
#endif
-#if !HAVE_ALPHASORT || !HAVE_SCANDIR
-#include php_scandir.h
-#endif
#ifdef HAVE_GLOB
#ifndef PHP_WIN32
@@ -466,9 +464,9 @@
}
if (!flags) {
- n = scandir(path, namelist, 0, alphasort);
+ n = php_scandir(path, namelist, 0, php_alphasort);
} else {
- n = scandir(path, namelist, 0, php_alphasortr);
+ n = php_scandir(path, namelist, 0, php_alphasortr);
}
if (n 0) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /main php_ini.c php_scandir.c php_scandir.h
sniper Wed Feb 19 04:28:37 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/main php_ini.c php_scandir.c php_scandir.h
Log:
MFH: prevent conflicts with other libraries (e.g. libc-client)
Index: php4/main/php_ini.c
diff -u php4/main/php_ini.c:1.106.2.5 php4/main/php_ini.c:1.106.2.6
--- php4/main/php_ini.c:1.106.2.5 Mon Feb 3 07:25:47 2003
+++ php4/main/php_ini.c Wed Feb 19 04:28:37 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_ini.c,v 1.106.2.5 2003/02/03 12:25:47 sniper Exp $ */
+/* $Id: php_ini.c,v 1.106.2.6 2003/02/19 09:28:37 sniper Exp $ */
/* Check CWD for php.ini */
#define INI_CHECK_CWD
@@ -30,11 +30,10 @@
#include zend_highlight.h
#include SAPI.h
#include php_main.h
+#include php_scandir.h
-#if !HAVE_SCANDIR || !HAVE_ALPHASORT
- #include php_scandir.h
-#else
- #include dirent.h
+#if HAVE_SCANDIR HAVE_ALPHASORT HAVE_DIRENT_H
+#include dirent.h
#endif
#ifndef S_ISREG
@@ -404,7 +403,7 @@
struct dirent **namelist;
int ndir, i;
- if ((ndir = scandir(PHP_CONFIG_FILE_SCAN_DIR, namelist, 0,
alphasort)) 0) {
+ if ((ndir = php_scandir(PHP_CONFIG_FILE_SCAN_DIR, namelist, 0,
+php_alphasort)) 0) {
for (i = 0; i ndir; i++) {
/* check for a .ini extension */
if (!(p = strrchr(namelist[i]-d_name, '.')) || (p
strcmp(p, .ini))) {
Index: php4/main/php_scandir.c
diff -u php4/main/php_scandir.c:1.2.2.4 php4/main/php_scandir.c:1.2.2.5
--- php4/main/php_scandir.c:1.2.2.4 Sun Feb 2 15:27:01 2003
+++ php4/main/php_scandir.c Wed Feb 19 04:28:37 2003
@@ -17,6 +17,8 @@
+--+
*/
+/* $Id: php_scandir.c,v 1.2.2.5 2003/02/19 09:28:37 sniper Exp $ */
+
#ifdef PHP_WIN32
#include config.w32.h
#else
@@ -26,7 +28,10 @@
#include php_scandir.h
#ifndef HAVE_SCANDIR
+
+#ifdef HAVE_SYS_TYPES_H
#include sys/types.h
+#endif
#ifdef HAVE_DIRENT_H
#include dirent.h
@@ -38,19 +43,23 @@
#include stdlib.h
#include search.h
-#endif
+
+#endif /* HAVE_SCANDIR */
#ifndef HAVE_ALPHASORT
+
+#ifdef HAVE_STRING_H
#include string.h
+#endif
-int alphasort(const struct dirent **a, const struct dirent **b)
+int php_alphasort(const struct dirent **a, const struct dirent **b)
{
return strcoll((*a)-d_name,(*b)-d_name);
}
-#endif
+#endif /* HAVE_ALPHASORT */
#ifndef HAVE_SCANDIR
-int scandir(const char *dirname, struct dirent **namelist[], int (*selector) (const
struct dirent *entry), int (*compare) (const struct dirent **a, const struct dirent
**b))
+int php_scandir(const char *dirname, struct dirent **namelist[], int (*selector)
+(const struct dirent *entry), int (*compare) (const struct dirent **a, const struct
+dirent **b))
{
DIR *dirp = NULL;
struct dirent **vector = NULL;
@@ -117,3 +126,12 @@
return -1;
}
#endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim600: sw=4 ts=4
+ */
Index: php4/main/php_scandir.h
diff -u php4/main/php_scandir.h:1.2.2.2 php4/main/php_scandir.h:1.2.2.3
--- php4/main/php_scandir.h:1.2.2.2 Sun Feb 2 18:09:40 2003
+++ php4/main/php_scandir.h Wed Feb 19 04:28:37 2003
@@ -1,3 +1,27 @@
+/*
+ +--+
+ | PHP Version 4|
+ +--+
+ | Copyright (c) 1997-2003 The PHP Group|
+ +--+
+ | This source file is subject to version 2.02 of the PHP license, |
+ | that is bundled with this package in the file LICENSE, and is|
+ | available at through the world-wide-web at |
+ | http://www.php.net/license/2_02.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: Shane Caraveo [EMAIL PROTECTED] |
+ | Ilia Alshanetsky [EMAIL PROTECTED]|
+ +--+
+*/
+
+/* $Id: php_scandir.h,v 1.2.2.3 2003/02/19 09:28:37 sniper Exp $ */
+
+#ifndef PHP_SCANDIR_H
+#define PHP_SCANDIR_H
+
#include sys/types.h
#ifdef PHP_WIN32
@@ -7,14 +31,19 @@
#include php_config.h
#endif
+#ifdef HAVE_SCANDIR
#ifdef HAVE_DIRENT_H
-# include dirent.h
+#include dirent.h
#endif
-
-#ifndef
Re: [PHP-CVS] cvs: php4 /ext/informix ifx.ec
On Wed, 19 Feb 2003, Corne' Cornelius wrote:
nobbieWed Feb 19 04:29:26 2003 EDT
Modified files:
/php4/ext/informixifx.ec
Log:
- Added Input Descriptor Binding to be used by blobs. This fixed a bug
where ESQL/C would cause a Segmentation fault if the first blob in a
result is NULL or '' as soon as it gets a result with blob != NULL
- Fixed leaks where blobs resources weren't always freed
A few comments:
@@ -116,7 +122,7 @@
{ \
if (ifx_check() 0) { \
IFXG(sv_sqlcode) = SQLCODE; \
-php_error_docref(NULL TSRMLS_CC, E_WARNING, Set connection %s fails
(%s), ifx, ifx_error(ifx)); \
+php_error(E_WARNING, %s(): Set connection %s fails (%s),
+get_active_function_name(TSRMLS_C), ifx, ifx_error(ifx)); \
RETURN_FALSE; \
} \
}
Always use the php_error_docref for new code.
And why did you revert the patch that made it use zend_parse_params
instead of the ugly stuff that is in now? AFACS you used an older
version of the module, and thus revert several patches (including
fixes). Please go over the code again very carefully. I think it would
be best to revert your latest patch and start adding your fixes again.
regards,
Derick
--
Stop mad cowboy disease!
-
Derick Rethans http://derickrethans.nl/
PHP Magazine - PHP Magazine for Professionals http://php-mag.net/
-
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/informix ifx.ec
Hi,
The version i changed on was 1.69, the latest was 1.78. I did a
'cvs update'
and it showed
'M ext/informix/ifx.ec'
but it doens't seem to have merged my file with the latest one. Any
ideas why ?
how can i revert it ?
Sorry, CVS newbie (used to RCS)
Derick Rethans wrote:
On Wed, 19 Feb 2003, Corne' Cornelius wrote:
nobbie Wed Feb 19 04:29:26 2003 EDT
Modified files:
/php4/ext/informix ifx.ec
Log:
- Added Input Descriptor Binding to be used by blobs. This fixed a bug
where ESQL/C would cause a Segmentation fault if the first blob in a
result is NULL or '' as soon as it gets a result with blob != NULL
- Fixed leaks where blobs resources weren't always freed
A few comments:
@@ -116,7 +122,7 @@
{ \
if (ifx_check() 0) { \
IFXG(sv_sqlcode) = SQLCODE; \
-php_error_docref(NULL TSRMLS_CC, E_WARNING, Set connection %s fails (%s), ifx, ifx_error(ifx)); \
+php_error(E_WARNING, %s(): Set connection %s fails (%s), get_active_function_name(TSRMLS_C), ifx, ifx_error(ifx)); \
RETURN_FALSE; \
} \
}
Always use the php_error_docref for new code.
And why did you revert the patch that made it use zend_parse_params
instead of the ugly stuff that is in now? AFACS you used an older
version of the module, and thus revert several patches (including
fixes). Please go over the code again very carefully. I think it would
be best to revert your latest patch and start adding your fixes again.
regards,
Derick
=Disclaimer and Confidentiality===
This message contains information intended for the perusal, and/or use (if so stated), by the stated addressee(s) only. The information is confidential and privileged. If you are not an intended recipient, do not peruse, use, disseminate, distribute, copy or in any manner rely upon he information contained in this message (directly or indirectly). The sender and/or the entity represented by the sender shall not be held accountable in the event that this prohibition is disregarded. If you receive this message in error, notify the sender immediately by e-mail, fax or telephone representations contained in this message, whether express or implied, are those of the sender only, unless that sender expressly states them to be the views or representations of an entity or person, who shall be named by the sender and who the sender shall state to represent. No liability shall otherwise attach to any other entity or person. ==
Re: [PHP-CVS] cvs: php4 /ext/informix config.m4
Which version might that be? There was a fix just recently for this. Are you sure this doesn't break that fix and works also for older versions?? --Jani On Wed, 19 Feb 2003, Corne' Cornelius wrote: nobbie Wed Feb 19 02:16:01 2003 EDT Modified files: /php4/ext/informix config.m4 Log: Updated IFX_VERSION entry to work with new Version output of ESQL/C @- Updated IFX_VERSION entry to work with new Version output of ESQL/C (Corne') Index: php4/ext/informix/config.m4 diff -u php4/ext/informix/config.m4:1.28 php4/ext/informix/config.m4:1.29 --- php4/ext/informix/config.m4:1.28 Mon Jan 13 18:31:12 2003 +++ php4/ext/informix/config.m4Wed Feb 19 02:16:00 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.28 2003/01/13 23:31:12 sniper Exp $ +dnl $Id: config.m4,v 1.29 2003/02/19 07:16:00 nobbie Exp $ dnl PHP_ARG_WITH(informix,for Informix support, @@ -44,7 +44,7 @@ esac AC_MSG_CHECKING([Informix version]) - IFX_VERSION=[`$INFORMIXDIR/bin/esql -V | sed -ne '1 s/^.*Version \([0-9]\)\.\([0-9]*\).*$/\1\2/p'`] + IFX_VERSION=[`$INFORMIXDIR/bin/esql -V | grep ESQL Version | sed -ne '1 s/\(.*\)ESQL Version \([0-9]\)\.\([0-9]*\).*/\2\3/p'`] AC_MSG_RESULT($IFX_VERSION) AC_DEFINE_UNQUOTED(IFX_VERSION, $IFX_VERSION, [ ]) -- - For Sale! - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/informix ifx.ec
On Wed, 19 Feb 2003, Corne' Cornelius wrote: Hi, The version i changed on was 1.69, the latest was 1.78. I did a 'cvs update' and it showed 'M ext/informix/ifx.ec' but it doens't seem to have merged my file with the latest one. Any ideas why ? Nope, better to do the update before you make changes :) how can i revert it ? cd /source/php4 cvs diff -r 1.78 -r 1.79 ext/informix/ifx.ec /tmp/patch patch -p0 -R /tmp/patch cvs commit -m - Revert latest commit ext/informix/ifx.ec regards, Derick -- Stop mad cowboy disease! - Derick Rethans http://derickrethans.nl/ PHP Magazine - PHP Magazine for Professionals http://php-mag.net/ - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /sapi/thttpd README
sas Wed Feb 19 05:57:21 2003 EDT Modified files: /php4/sapi/thttpd README Log: some improvements Index: php4/sapi/thttpd/README diff -u php4/sapi/thttpd/README:1.12 php4/sapi/thttpd/README:1.13 --- php4/sapi/thttpd/README:1.12Thu Nov 7 06:38:03 2002 +++ php4/sapi/thttpd/README Wed Feb 19 05:57:21 2003 @@ -1,12 +1,12 @@ README FOR THTTPD MODULE (by Sascha Schumann) -($Date: 2002/11/07 11:38:03 $) +($Date: 2003/02/19 10:57:21 $) This is a SAPI module for PHP 4.x supporting thttpd, the tiny, turbo, throttling HTTP server by Jef Poskanzer. - NOTE: All requests will be serialized. That means, one long running + NOTE: All HTTP requests will be serialized. That means, one long running script will block all other requests. Choose another web server, - if you want to execute arbitrary scripts. + if you want to execute arbitrarily long running scripts. The module contains a patch against version 2.21b of thttpd. The patch fixes a number of bugs and adds some functionality: @@ -14,11 +14,13 @@ - HTTP/1.1 Persistent Connection/Pipeline Support - PHP Scripting (**.php by default) - Highlighting PHP Scripts (**.phps by default) - - Fast Accept Loop - - Periodic Connection Expiring - - Fixes the Host: header vulnerability - - Asynchronous request body handling - - Fixup for non-blocking send of thttpd-generated responses + - Fast Accept Loop (unique to PHP) + - Periodic Connection Expiring (unique to PHP) + - Log to stdout (logfile=-) + - Fixes the Host: header vulnerability (affects vhosts only) + - Asynchronous request body handling (e.g. for POSTs) + - Accept filter for Linux + - Fix for non-blocking sending of thttpd-generated responses You can configure the filename extensions by creating a config file for thttpd and setting these entries: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4) /sapi/thttpd README
sas Wed Feb 19 06:00:50 2003 EDT Modified files: (Branch: PHP_4) /php4/sapi/thttpd README Log: some improvements Index: php4/sapi/thttpd/README diff -u php4/sapi/thttpd/README:1.12 php4/sapi/thttpd/README:1.12.4.1 --- php4/sapi/thttpd/README:1.12Thu Nov 7 06:38:03 2002 +++ php4/sapi/thttpd/README Wed Feb 19 06:00:48 2003 @@ -1,12 +1,12 @@ README FOR THTTPD MODULE (by Sascha Schumann) -($Date: 2002/11/07 11:38:03 $) +($Date: 2003/02/19 11:00:48 $) This is a SAPI module for PHP 4.x supporting thttpd, the tiny, turbo, throttling HTTP server by Jef Poskanzer. - NOTE: All requests will be serialized. That means, one long running + NOTE: All HTTP requests will be serialized. That means, one long running script will block all other requests. Choose another web server, - if you want to execute arbitrary scripts. + if you want to execute arbitrarily long running scripts. The module contains a patch against version 2.21b of thttpd. The patch fixes a number of bugs and adds some functionality: @@ -14,11 +14,13 @@ - HTTP/1.1 Persistent Connection/Pipeline Support - PHP Scripting (**.php by default) - Highlighting PHP Scripts (**.phps by default) - - Fast Accept Loop - - Periodic Connection Expiring - - Fixes the Host: header vulnerability - - Asynchronous request body handling - - Fixup for non-blocking send of thttpd-generated responses + - Fast Accept Loop (unique to PHP) + - Periodic Connection Expiring (unique to PHP) + - Log to stdout (logfile=-) + - Fixes the Host: header vulnerability (affects vhosts only) + - Asynchronous request body handling (e.g. for POSTs) + - Accept filter for Linux + - Fix for non-blocking sending of thttpd-generated responses You can configure the filename extensions by creating a config file for thttpd and setting these entries: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /sapi/thttpd README
sas Wed Feb 19 06:01:38 2003 EDT Modified files: (Branch: PHP_4_3) /php4/sapi/thttpd README Log: some improvements Index: php4/sapi/thttpd/README diff -u php4/sapi/thttpd/README:1.12 php4/sapi/thttpd/README:1.12.2.1 --- php4/sapi/thttpd/README:1.12Thu Nov 7 06:38:03 2002 +++ php4/sapi/thttpd/README Wed Feb 19 06:01:38 2003 @@ -1,12 +1,12 @@ README FOR THTTPD MODULE (by Sascha Schumann) -($Date: 2002/11/07 11:38:03 $) +($Date: 2003/02/19 11:01:38 $) This is a SAPI module for PHP 4.x supporting thttpd, the tiny, turbo, throttling HTTP server by Jef Poskanzer. - NOTE: All requests will be serialized. That means, one long running + NOTE: All HTTP requests will be serialized. That means, one long running script will block all other requests. Choose another web server, - if you want to execute arbitrary scripts. + if you want to execute arbitrarily long running scripts. The module contains a patch against version 2.21b of thttpd. The patch fixes a number of bugs and adds some functionality: @@ -14,11 +14,13 @@ - HTTP/1.1 Persistent Connection/Pipeline Support - PHP Scripting (**.php by default) - Highlighting PHP Scripts (**.phps by default) - - Fast Accept Loop - - Periodic Connection Expiring - - Fixes the Host: header vulnerability - - Asynchronous request body handling - - Fixup for non-blocking send of thttpd-generated responses + - Fast Accept Loop (unique to PHP) + - Periodic Connection Expiring (unique to PHP) + - Log to stdout (logfile=-) + - Fixes the Host: header vulnerability (affects vhosts only) + - Asynchronous request body handling (e.g. for POSTs) + - Accept filter for Linux + - Fix for non-blocking sending of thttpd-generated responses You can configure the filename extensions by creating a config file for thttpd and setting these entries: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /win32 php5ts.dsw
phanto Wed Feb 19 06:04:55 2003 EDT Removed files: (Branch: PHP_4_3) /php4/win32 php5ts.dsw Log: remove php5ts workspace from PHP_4_3 branch -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/dbx dbx_pgsql.c
mboeren Wed Feb 19 08:32:28 2003 EDT
Modified files:
/php4/ext/dbx dbx_pgsql.c
Log:
Fix for bug #1: pgsql version for dbx_query suppressed a warning that
was trappable by using a user-defined error-handler. A different use of
pgsql_getrow removed the warning and thus the need for suppressing it.
Index: php4/ext/dbx/dbx_pgsql.c
diff -u php4/ext/dbx/dbx_pgsql.c:1.21 php4/ext/dbx/dbx_pgsql.c:1.22
--- php4/ext/dbx/dbx_pgsql.c:1.21 Tue Dec 31 11:06:28 2002
+++ php4/ext/dbx/dbx_pgsql.cWed Feb 19 08:32:27 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dbx_pgsql.c,v 1.21 2002/12/31 16:06:28 sebastian Exp $ */
+/* $Id: dbx_pgsql.c,v 1.22 2003/02/19 13:32:27 mboeren Exp $ */
#include dbx.h
#include php_dbx.h
@@ -228,31 +228,17 @@
int dbx_pgsql_getrow(zval **rv, zval **result_handle, long row_number,
INTERNAL_FUNCTION_PARAMETERS)
{
/* returns array[0..columncount-1] as strings on success or 0 as long on
failure */
- int number_of_arguments=2;
- int save_error_reporting=0;
- zval **arguments[2];
- zval *zval_row=NULL;
+ int number_of_arguments=1;
+ zval **arguments[1];
zval *returned_zval=NULL;
- MAKE_STD_ZVAL(zval_row);
- ZVAL_LONG(zval_row, row_number);
arguments[0]=result_handle;
- arguments[1]=zval_row;
- if (EG(error_reporting) E_WARNING){
- save_error_reporting = EG(error_reporting);
- EG(error_reporting) = ~E_WARNING;
- }
dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, pg_fetch_array,
returned_zval, number_of_arguments, arguments);
- if (save_error_reporting) {
- EG(error_reporting) = save_error_reporting;
- }
if (!returned_zval || Z_TYPE_P(returned_zval)!=IS_ARRAY) {
if (returned_zval) zval_ptr_dtor(returned_zval);
- FREE_ZVAL(zval_row);
return 0;
}
- FREE_ZVAL(zval_row);
MOVE_RETURNED_TO_RV(rv, returned_zval);
return 1;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /scripts/ext_skel_ng extension.xml
hholzgraWed Feb 19 09:50:43 2003 EDT Modified files: /php4/scripts/ext_skel_ng extension.xml Log: test specifications for MINIT and friends Index: php4/scripts/ext_skel_ng/extension.xml diff -u php4/scripts/ext_skel_ng/extension.xml:1.1 php4/scripts/ext_skel_ng/extension.xml:1.2 --- php4/scripts/ext_skel_ng/extension.xml:1.1 Wed Feb 19 05:07:22 2003 +++ php4/scripts/ext_skel_ng/extension.xml Wed Feb 19 09:50:43 2003 @@ -55,28 +55,79 @@ /globals functions + +function role='internal' name='MINIT' + code +![CDATA[ + int dummy = 42; + + dummy = dummy; +]] + /code +/function + +function role='internal' name='MSHUTDOWN' + code +![CDATA[ + int dummy = 42; + + dummy = dummy; +]] + /code +/function + +function role='internal' name='RINIT' + code +![CDATA[ + int dummy = 42; + + dummy = dummy; +]] + /code +/function - function name='dummy_int' -summarydummy integer conversion/summary - protoint dummy_int(int bar)/proto -description +function role='internal' name='RSHUTDOWN' + code +![CDATA[ + int dummy = 42; + + dummy = dummy; +]] + /code +/function + +function role='internal' name='MINFO' + code +![CDATA[ + php_info_print_table_start(); + php_info_print_table_header(2, test, table); + php_info_print_table_end(); +]] + /code +/function + + + function role='public' name='dummy_int' + summarydummy integer conversion/summary + protoint dummy_int(int bar)/proto + description some funcy longer description foo bar - /description - /function - - function name='dummy_string' -summarydummy string conversion/summary - protostring dummy_string(string bar) foobar/proto - code + /description + /function + + function name='dummy_string' + summarydummy string conversion/summary + protostring dummy_string(string bar) foobar/proto + code ![CDATA[ RETURN_STRINGL(bar, bar_len, 1); ]] -/code - /function - + /code + /function + /functions /extension -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / NEWS
wez Wed Feb 19 09:59:26 2003 EDT Modified files: /php4 NEWS Log: News about the ZE stream thing Index: php4/NEWS diff -u php4/NEWS:1.1346 php4/NEWS:1.1347 --- php4/NEWS:1.1346Wed Feb 19 01:33:43 2003 +++ php4/NEWS Wed Feb 19 09:59:26 2003 @@ -14,6 +14,9 @@ - Changed array_search() to accept also objects as a needle. (Moriyoshi) - Changed ext/mcrypt to require libmcrypt version 2.5.6 or greater. (Derick) - Changed uniqid() parameters to be optional and allow any prefix length. (Marcus) +- Added lightweight streaming input abstraction to the Zend Engine scanners + the provides uniform support for include()'ing data from PHP streams across + all platforms (Wez, Zend Engine). - Added optional parameter to sha1() and md5() which makes them return the digest as binary data. (Michael Bretterklieber [EMAIL PROTECTED], Derick) - Added proc_nice() function. Changes priority of the current process. (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] php4/ext/informix update - test build ?
I've made a patch for the Informix extension. How should i test the change ? From my cvs dir for php4, i did: ./buildconf --ZendEngine2 ./configure --with-apxs=/usr/local/apache/bin/apxs --with-zlib --with-informix=/opt/informix --enable-debug make and got: /home/corne/php4/ext/standard/basic_functions.c: In function `php_simple_ini_parser_cb': /home/corne/php4/ext/standard/basic_functions.c:2845: `ZEND_INI_PARSER_POP_ENTRY' undeclared (first use in this function) /home/corne/php4/ext/standard/basic_functions.c:2845: (Each undeclared identifier is reported only once /home/corne/php4/ext/standard/basic_functions.c:2845: for each function it appears in.) =Disclaimer and Confidentiality=== This message contains information intended for the perusal, and/or use (if so stated), by the stated addressee(s) only. The information is confidential and privileged. If you are not an intended recipient, do not peruse, use, disseminate, distribute, copy or in any manner rely upon he information contained in this message (directly or indirectly). The sender and/or the entity represented by the sender shall not be held accountable in the event that this prohibition is disregarded. If you receive this message in error, notify the sender immediately by e-mail, fax or telephone representations contained in this message, whether express or implied, are those of the sender only, unless that sender expressly states them to be the views or representations of an entity or person, who shall be named by the sender and who the sender shall state to represent. No liability shall otherwise attach to any other entity or person. == -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / NEWS
wez Wed Feb 19 10:07:45 2003 EDT Modified files: /php4 NEWS Log: typo.. Index: php4/NEWS diff -u php4/NEWS:1.1347 php4/NEWS:1.1348 --- php4/NEWS:1.1347Wed Feb 19 09:59:26 2003 +++ php4/NEWS Wed Feb 19 10:07:45 2003 @@ -15,7 +15,7 @@ - Changed ext/mcrypt to require libmcrypt version 2.5.6 or greater. (Derick) - Changed uniqid() parameters to be optional and allow any prefix length. (Marcus) - Added lightweight streaming input abstraction to the Zend Engine scanners - the provides uniform support for include()'ing data from PHP streams across + that provides uniform support for include()'ing data from PHP streams across all platforms (Wez, Zend Engine). - Added optional parameter to sha1() and md5() which makes them return the digest as binary data. (Michael Bretterklieber [EMAIL PROTECTED], Derick) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /scripts/ext_skel_ng extension.xml extension_parser.php php_function.php
hholzgraWed Feb 19 11:02:46 2003 EDT
Modified files:
/php4/scripts/ext_skel_ng extension.xml extension_parser.php
php_function.php
Log:
code for the special functions MINIT, MSHUTDOWN, RINIT, RSHUTDOWN, MINFO
and for private internal C helper functions may now be embedded into
the XML specification
Index: php4/scripts/ext_skel_ng/extension.xml
diff -u php4/scripts/ext_skel_ng/extension.xml:1.2
php4/scripts/ext_skel_ng/extension.xml:1.3
--- php4/scripts/ext_skel_ng/extension.xml:1.2 Wed Feb 19 09:50:43 2003
+++ php4/scripts/ext_skel_ng/extension.xml Wed Feb 19 11:02:45 2003
@@ -106,6 +106,16 @@
/code
/function
+ function role='private' name='myfunc'
+ code
+![CDATA[
+ static int myfunc(void) {
+return 23;
+ }
+]]
+ /code
+/function
+
function role='public' name='dummy_int'
summarydummy integer conversion/summary
Index: php4/scripts/ext_skel_ng/extension_parser.php
diff -u php4/scripts/ext_skel_ng/extension_parser.php:1.2
php4/scripts/ext_skel_ng/extension_parser.php:1.3
--- php4/scripts/ext_skel_ng/extension_parser.php:1.2 Wed Feb 19 05:12:28 2003
+++ php4/scripts/ext_skel_ng/extension_parser.php Wed Feb 19 11:02:45 2003
@@ -23,6 +23,8 @@
$this-constants = array();
$this-functions = array();
+ $this-internal_functions = array();
+ $this-private_functions = array();
$this-globals = array();
$this-phpini= array();
$this-users = array();
@@ -128,7 +130,22 @@
}
function handle_functions_function($attr) {
- $this-functions[$attr['name']] = new
php_function($attr['name'], $this-func_summary, $this-func_proto, @$this-func_desc,
@$this-func_code);
+ $role = isset($attr['role']) ? $attr['role'] : public;
+ $function = new php_function($attr['name'],
+$this-func_summary, $this-func_proto, @$this-func_desc, @$this-func_code, $role);
+ switch($role) {
+ case internal:
+ $this-internal_functions[$attr['name']] = $function;
+ break;
+ case private:
+ $this-private_functions[$attr['name']] = $function;
+ break;
+ case public:
+ $this-functions[$attr['name']] = $function;
+ break;
+ default:
+ $this-error(function role must be either public,
+private or internal);
+ break;
+ }
unset($this-func_summary);
unset($this-func_proto);
unset($this-func_desc);
@@ -206,7 +223,7 @@
$fp = fopen($docdir/reference.xml, w);
fputs($fp,
?xml version='1.0' encoding='iso-8859-1'?
-!-- \$Revision: 1.2 $ --
+!-- \$Revision: 1.3 $ --
reference id='ref.{$this-name}'
title{$this-summary}/title
titleabbrev{$this-name}/titleabbrev
@@ -477,15 +494,20 @@
;
if(count($this-globals)) {
- $code .= ZEND_INIT_MODULE_GLOBALS({$this-name},
php_{$this-name}_init_globals, NULL)\n;
+ $code .= \tZEND_INIT_MODULE_GLOBALS({$this-name},
+php_{$this-name}_init_globals, NULL)\n;
}
if(count($this-phpini)) {
- $code .= REGISTER_INI_ENTRIES();\n;
+ $code .= \tREGISTER_INI_ENTRIES();\n;
}
- $code .=\n /* add your stuff here */\n;
-
+ if(isset($this-internal_functions['MINIT'])) {
+ if(count($this-globals) || count($this-phpini)) $code .= \n\t{\n;
+ $code .= $this-internal_functions['MINIT']-code;
+ if(count($this-globals) || count($this-phpini)) $code .= \n\t}\n;
+ } else {
+ $code .=\n\t/* add your stuff here */\n;
+ }
$code .=
return SUCCESS;
}
@@ -500,10 +522,16 @@
;
if(count($this-phpini)) {
- $code .= UNREGISTER_INI_ENTRIES();\n;
+ $code .= \tUNREGISTER_INI_ENTRIES();\n;
}
- $code .=\n /* add your stuff here */\n;
+ if(isset($this-internal_functions['MSHUTDOWN'])) {
+ if(count($this-phpini)) $code .= \n\t{\n;
+ $code .= $this-internal_functions['MSHUTDOWN']-code;
+ if(count($this-phpini)) $code .= \n\t}\n;
+ } else {
+ $code .=\n\t/* add your stuff here */\n;
+}
[PHP-CVS] cvs: php4 /main main.c
phanto Wed Feb 19 11:17:16 2003 EDT
Modified files:
/php4/main main.c
Log:
prevent xdebug from crashing
Index: php4/main/main.c
diff -u php4/main/main.c:1.527 php4/main/main.c:1.528
--- php4/main/main.c:1.527 Tue Feb 18 04:37:54 2003
+++ php4/main/main.cWed Feb 19 11:17:15 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.527 2003/02/18 09:37:54 wez Exp $ */
+/* $Id: main.c,v 1.528 2003/02/19 16:17:15 phanto Exp $ */
/* {{{ includes
*/
@@ -1064,6 +1064,10 @@
void php_request_shutdown(void *dummy)
{
TSRMLS_FETCH();
+
+ /* EG(opline_ptr) points into nirvana and therefore cannot be safely accessed
+ inside zend_executor callback functions. */
+ EG(opline_ptr) = NULL;
zend_try {
php_end_ob_buffers((zend_bool)(SG(request_info).headers_only?0:1)
TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /main main.c
phanto Wed Feb 19 11:17:34 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/main main.c
Log:
MFH
Index: php4/main/main.c
diff -u php4/main/main.c:1.512.2.10 php4/main/main.c:1.512.2.11
--- php4/main/main.c:1.512.2.10 Sat Feb 15 15:23:12 2003
+++ php4/main/main.cWed Feb 19 11:17:34 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.512.2.10 2003/02/15 20:23:12 sniper Exp $ */
+/* $Id: main.c,v 1.512.2.11 2003/02/19 16:17:34 phanto Exp $ */
/* {{{ includes
*/
@@ -915,6 +915,10 @@
void php_request_shutdown(void *dummy)
{
TSRMLS_FETCH();
+
+ /* EG(opline_ptr) points into nirvana and therefore cannot be safely accessed
+ inside zend_executor callback functions. */
+ EG(opline_ptr) = NULL;
zend_try {
php_end_ob_buffers((zend_bool)(SG(request_info).headers_only?0:1)
TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 / README.input_filter /ext/mbstring mb_gpc.cmbstring.c /main SAPI.c SAPI.h php_content_types.c php_variables.c rfc1867.c
Yup, I did miss that mbstring case. Thanks.
-Rasmus
On Wed, 19 Feb 2003, Marcus Börger wrote:
At 20:41 19.02.2003, Rasmus Lerdorf wrote:
rasmus Wed Feb 19 14:41:10 2003 EDT
Added files:
/php4 README.input_filter
Modified files:
/php4/ext/mbstring mb_gpc.c mbstring.c
/php4/main SAPI.c SAPI.h php_content_types.c php_variables.c
rfc1867.c
Log:
Input Filter support. See README.input_filter for details.
@- Input Filter support added. See README.input_filter. (Rasmus)
That broke the build - I suppose you missed this:
cvs -z3 -q diff mb_gpc.c mb_gpc.h (in directory S:\php4-HEAD\ext\mbstring\)
Index: mb_gpc.c
===
RCS file: /repository/php4/ext/mbstring/mb_gpc.c,v
retrieving revision 1.4
diff -u -r1.4 mb_gpc.c
--- mb_gpc.c19 Feb 2003 19:41:07 - 1.4
+++ mb_gpc.c19 Feb 2003 20:43:10 -
@@ -379,7 +379,7 @@
{
MBSTRG(http_input_identify_post) = mbfl_no_encoding_invalid;
- _php_mb_encoding_handler_ex(arg, SG(request_info).post_data, ,
0, 0 TSRMLS_CC);
+ _php_mb_encoding_handler_ex(PARSE_POST, arg,
SG(request_info).post_data, , 0, 0 TSRMLS_CC);
if (MBSTRG(http_input_identify) != mbfl_no_encoding_invalid) {
MBSTRG(http_input_identify_post) =
MBSTRG(http_input_identify);
Index: mb_gpc.h
===
RCS file: /repository/php4/ext/mbstring/mb_gpc.h,v
retrieving revision 1.1
diff -u -r1.1 mb_gpc.h
--- mb_gpc.h23 Nov 2002 20:08:44 - 1.1
+++ mb_gpc.h19 Feb 2003 20:43:10 -
@@ -33,7 +33,7 @@
MBSTRING_API SAPI_TREAT_DATA_FUNC(mbstr_treat_data);
int _php_mb_enable_encoding_translation(int flag);
-int _php_mb_encoding_handler_ex(zval *arg, char *res, char *separator, int
force_register_globals, int report_errors TSRMLS_DC);
+int _php_mb_encoding_handler_ex(int data_type, zval *arg, char *res, char
*separator, int force_register_globals, int report_errors TSRMLS_DC);
/* }}} */
#endif /* HAVE_MBSTRING */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/mbstring mb_gpc.c mb_gpc.h
rasmus Wed Feb 19 15:56:48 2003 EDT
Modified files:
/php4/ext/mbstring mb_gpc.c mb_gpc.h
Log:
Fix mbstring input_filter
Index: php4/ext/mbstring/mb_gpc.c
diff -u php4/ext/mbstring/mb_gpc.c:1.4 php4/ext/mbstring/mb_gpc.c:1.5
--- php4/ext/mbstring/mb_gpc.c:1.4 Wed Feb 19 14:41:07 2003
+++ php4/ext/mbstring/mb_gpc.c Wed Feb 19 15:56:47 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mb_gpc.c,v 1.4 2003/02/19 19:41:07 rasmus Exp $ */
+/* $Id: mb_gpc.c,v 1.5 2003/02/19 20:56:47 rasmus Exp $ */
/* {{{ includes */
#ifdef HAVE_CONFIG_H
@@ -379,7 +379,7 @@
{
MBSTRG(http_input_identify_post) = mbfl_no_encoding_invalid;
- _php_mb_encoding_handler_ex(arg, SG(request_info).post_data, , 0, 0
TSRMLS_CC);
+ _php_mb_encoding_handler_ex(PARSE_POST, arg, SG(request_info).post_data, ,
+0, 0 TSRMLS_CC);
if (MBSTRG(http_input_identify) != mbfl_no_encoding_invalid) {
MBSTRG(http_input_identify_post) = MBSTRG(http_input_identify);
Index: php4/ext/mbstring/mb_gpc.h
diff -u php4/ext/mbstring/mb_gpc.h:1.1 php4/ext/mbstring/mb_gpc.h:1.2
--- php4/ext/mbstring/mb_gpc.h:1.1 Sat Nov 23 15:08:44 2002
+++ php4/ext/mbstring/mb_gpc.h Wed Feb 19 15:56:47 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mb_gpc.h,v 1.1 2002/11/23 20:08:44 moriyoshi Exp $ */
+/* $Id: mb_gpc.h,v 1.2 2003/02/19 20:56:47 rasmus Exp $ */
/* {{{ includes */
#ifdef HAVE_CONFIG_H
@@ -33,7 +33,7 @@
MBSTRING_API SAPI_TREAT_DATA_FUNC(mbstr_treat_data);
int _php_mb_enable_encoding_translation(int flag);
-int _php_mb_encoding_handler_ex(zval *arg, char *res, char *separator, int
force_register_globals, int report_errors TSRMLS_DC);
+int _php_mb_encoding_handler_ex(int data_type, zval *arg, char *res, char *separator,
+int force_register_globals, int report_errors TSRMLS_DC);
/* }}} */
#endif /* HAVE_MBSTRING */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/rpc/skeleton php_skeleton.h skeleton.c skeleton.h
jon Wed Feb 19 16:36:00 2003 EDT
Modified files:
/php4/ext/rpc/skeleton php_skeleton.h skeleton.c skeleton.h
Log:
Add folding markers and editor directive blocks.
Index: php4/ext/rpc/skeleton/php_skeleton.h
diff -u php4/ext/rpc/skeleton/php_skeleton.h:1.1
php4/ext/rpc/skeleton/php_skeleton.h:1.2
--- php4/ext/rpc/skeleton/php_skeleton.h:1.1Thu Jan 16 13:46:58 2003
+++ php4/ext/rpc/skeleton/php_skeleton.hWed Feb 19 16:35:59 2003
@@ -22,4 +22,12 @@
extern zend_module_entry skeleton_module_entry;
#define phpext_skeleton_ptr skeleton_module_entry
-#endif /* PHP_SKELETON_H */
\ No newline at end of file
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 4
+ * End:
+ * vim600: fdm=marker
+ * vim: sw=4 ts=4 noet
+ */
+#endif /* PHP_SKELETON_H */
Index: php4/ext/rpc/skeleton/skeleton.c
diff -u php4/ext/rpc/skeleton/skeleton.c:1.6 php4/ext/rpc/skeleton/skeleton.c:1.7
--- php4/ext/rpc/skeleton/skeleton.c:1.6Tue Feb 18 18:22:14 2003
+++ php4/ext/rpc/skeleton/skeleton.cWed Feb 19 16:35:59 2003
@@ -120,6 +120,9 @@
#endif
/* rpc handler functions */
+
+/* {{{ skeleton_hash
+ */
static int skeleton_hash(rpc_string name, rpc_string *hash, void *data, int num_args,
char *arg_types, int type)
{
/* TODO: implement your hash function here. if you have specified any of the
HASH_AS_INT constants, simply set
@@ -133,13 +136,19 @@
return SUCCESS;
}
+/* }}} */
+/* {{{ skeleton_name
+ */
static int skeleton_name(rpc_string hash, rpc_string *name, void *data, int type)
{
/* TODO: do the opposite of what you did above */
return FAILURE;
}
+/* }}} */
+/* {{{ skeleton_ctor
+ */
static int skeleton_ctor(rpc_string class_name, void **data, int num_args, zval
**args[])
{
/* TODO: use *data as a pointer to your internal data. if you want to enable
your instances for
@@ -154,13 +163,19 @@
*/
return SUCCESS;
}
+/* }}} */
+/* {{{ skeleton_dtor
+ */
static int skeleton_dtor(void *data)
{
/* TODO: free everything you alloc'ed above */
return SUCCESS;
}
+/* }}} */
+/* {{{ skeleton_describe
+ */
static int skeleton_describe(rpc_string method_name, void *data, char **arg_types,
unsigned char **ref_types)
{
/* TODO: return a zend_parse_parameters() like string in arg_types to describe
the
@@ -170,7 +185,10 @@
*/
return SUCCESS;
}
+/* }}} */
+/* {{{ skeleton_call
+ */
static int skeleton_call(rpc_string method_name, void **data, zval *return_value, int
num_args, zval **args[])
{
/* TODO: implement call handler. if you passed back an arg_types string in the
describe function the arguments
@@ -179,45 +197,73 @@
*/
return SUCCESS;
}
+/* }}} */
+/* {{{ skeleton_get
+ */
static int skeleton_get(rpc_string property_name, zval *return_value, void **data)
{
/* TODO: implement get handler */
return SUCCESS;
}
+/* }}} */
+/* {{{ skeleton_set
+ */
static int skeleton_set(rpc_string property_name, zval *value, void **data)
{
/* TODO: implement set handler */
return SUCCESS;
}
+/* }}} */
+/* {{{ skeleton_compare
+ */
static int skeleton_compare(void **data1, void **data2)
{
/* TODO: implement compare handler */
return SUCCESS;
}
+/* }}} */
+/* {{{ skeleton_has_property
+ */
static int skeleton_has_property(rpc_string property_name, void **data)
{
/* TODO: implement has property handler */
return SUCCESS;
}
+/* }}} */
+/* {{{ skeleton_unset_property
+ */
static int skeleton_unset_property(rpc_string property_name, void **data)
{
/* TODO: implement unset property handler */
return SUCCESS;
}
+/* }}} */
+/* {{{ skeleton_get_properties
+ */
static int skeleton_get_properties(HashTable **properties, void **data)
{
/* TODO: implement get properties handler */
return SUCCESS;
}
+/* }}} */
/* custom functions */
ZEND_FUNCTION(skeleton_function)
{
}
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 4
+ * End:
+ * vim600: fdm=marker
+ * vim: sw=4 ts=4 noet
+ */
Index: php4/ext/rpc/skeleton/skeleton.h
diff -u php4/ext/rpc/skeleton/skeleton.h:1.4 php4/ext/rpc/skeleton/skeleton.h:1.5
--- php4/ext/rpc/skeleton/skeleton.h:1.4Thu Jan 16 13:46:58 2003
+++ php4/ext/rpc/skeleton/skeleton.hWed Feb 19 16:35:59 2003
@@ -32,4 +32,12 @@
ZEND_FUNCTION(skeleton_function);
/**/
-#endif /* SKELETON_H */
\ No newline at end of file
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 4
+ * End:
+ * vim600: fdm=marker
+ * vim: sw=4 ts=4 noet
+ */
+#endif /* SKELETON_H */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] php4/ext/informix update - test build ?
You have checkout of wrong module. It's php5 now: PHP 5: (HEAD) # cvs -d :pserver:[EMAIL PROTECTED]:/repository co php5 PHP 4.3.x: (PHP_4_3 branch) # cvs -d :pserver:[EMAIL PROTECTED]:/repository co -rPHP_4_3 php4 Only these two are used. --Jani On Wed, 19 Feb 2003, Corne' Cornelius wrote: I've made a patch for the Informix extension. How should i test the change ? From my cvs dir for php4, i did: ./buildconf --ZendEngine2 ./configure --with-apxs=/usr/local/apache/bin/apxs --with-zlib --with-informix=/opt/informix --enable-debug make and got: /home/corne/php4/ext/standard/basic_functions.c: In function `php_simple_ini_parser_cb': /home/corne/php4/ext/standard/basic_functions.c:2845: `ZEND_INI_PARSER_POP_ENTRY' undeclared (first use in this function) /home/corne/php4/ext/standard/basic_functions.c:2845: (Each undeclared identifier is reported only once /home/corne/php4/ext/standard/basic_functions.c:2845: for each function it appears in.) =Disclaimer and Confidentiality=== This message contains information intended for the perusal, and/or use (if so stated), by the stated addressee(s) only. The information is confidential and privileged. If you are not an intended recipient, do not peruse, use, disseminate, distribute, copy or in any manner rely upon he information contained in this message (directly or indirectly). The sender and/or the entity represented by the sender shall not be held accountable in the event that this prohibition is disregarded. If you receive this message in error, notify the sender immediately by e-mail, fax or telephone representations contained in this message, whether express or implied, are those of the sender only, unless that sender expressly states them to be the views or representations of an entity or person, who shall be named by the sender and who the sender shall state to represent. No liability shall otherwise attach to any other entity or person. == -- - For Sale! - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) / NEWS
sniper Wed Feb 19 19:15:56 2003 EDT Modified files: (Branch: PHP_4_3) /php4 NEWS Log: BFN Index: php4/NEWS diff -u php4/NEWS:1.1247.2.96 php4/NEWS:1.1247.2.97 --- php4/NEWS:1.1247.2.96 Tue Feb 18 19:50:36 2003 +++ php4/NEWS Wed Feb 19 19:15:55 2003 @@ -25,6 +25,7 @@ - Fixed bug #7 (printf() field limiters broke between 4.2.3 and 4.3.0). (Moriyoshi) - Fixed bug #4 (implode() changes object references in array). (Moriyoshi) +- Fixed bug #1 (bad rows count in the result object for postgresql). (Marc) - Fixed bug #22207 (e notation in *printf would be missing a 0 when there is no exponent). (Ilia) - Fixed bug #0 (php_admin_value open_basedir none does not work). (Jani) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / footer header
sniper Wed Feb 19 19:19:04 2003 EDT Modified files: /php4 footer header Log: consistent with the used style Index: php4/footer diff -u php4/footer:1.2 php4/footer:1.3 --- php4/footer:1.2 Sat Apr 21 21:09:12 2001 +++ php4/footer Wed Feb 19 19:19:04 2003 @@ -3,6 +3,7 @@ * Local variables: * tab-width: 4 * c-basic-offset: 4 - * indent-tabs-mode: t * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim600: noet sw=4 ts=4 */ Index: php4/header diff -u php4/header:1.11 php4/header:1.12 --- php4/header:1.11Fri Jan 17 17:54:47 2003 +++ php4/header Wed Feb 19 19:19:04 2003 @@ -14,6 +14,6 @@ +--+ | Author: | +--+ - - $Id: header,v 1.11 2003/01/17 22:54:47 moriyoshi Exp $ */ + +/* $Id: header,v 1.12 2003/02/20 00:19:04 sniper Exp $ */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard exec.c http_fopen_wrapper.c
iliaa Wed Feb 19 19:32:51 2003 EDT
Modified files:
/php4/ext/standard exec.c http_fopen_wrapper.c
Log:
Fixed bug #22308 (optimized passthru, code is now ~40 times faster).
Index: php4/ext/standard/exec.c
diff -u php4/ext/standard/exec.c:1.94 php4/ext/standard/exec.c:1.95
--- php4/ext/standard/exec.c:1.94 Mon Feb 17 20:23:51 2003
+++ php4/ext/standard/exec.cWed Feb 19 19:32:51 2003
@@ -15,7 +15,7 @@
| Author: Rasmus Lerdorf |
+--+
*/
-/* $Id: exec.c,v 1.94 2003/02/18 01:23:51 iliaa Exp $ */
+/* $Id: exec.c,v 1.95 2003/02/20 00:32:51 iliaa Exp $ */
#include stdio.h
#include php.h
@@ -211,11 +211,12 @@
RETVAL_STRINGL(buf, l, 1);
}
} else {
- int b, i;
+ size_t b;
- while ((b = fread(buf, 1, buflen, fp)) 0) {
- for (i = 0; i b; i++)
- if (output) (void)PUTC(buf[i]);
+ while ((b = fread(buf, buflen, 1, fp)) 0) {
+ if (output) {
+ PHPWRITE(buf, b);
+ }
}
}
Index: php4/ext/standard/http_fopen_wrapper.c
diff -u php4/ext/standard/http_fopen_wrapper.c:1.64
php4/ext/standard/http_fopen_wrapper.c:1.65
--- php4/ext/standard/http_fopen_wrapper.c:1.64 Tue Feb 18 19:49:31 2003
+++ php4/ext/standard/http_fopen_wrapper.c Wed Feb 19 19:32:51 2003
@@ -18,7 +18,7 @@
| Wez Furlong [EMAIL PROTECTED] |
+--+
*/
-/* $Id: http_fopen_wrapper.c,v 1.64 2003/02/19 00:49:31 iliaa Exp $ */
+/* $Id: http_fopen_wrapper.c,v 1.65 2003/02/20 00:32:51 iliaa Exp $ */
#include php.h
#include php_globals.h
@@ -354,7 +354,7 @@
s = resource-path;
*s = '/';
}
- s[1] = '\0';
+ *(s + 1) = '\0';
if (resource-path
*(resource-path) == '/' *(resource-path + 1) == '\0') {
snprintf(loc_path,
sizeof(loc_path) - 1, %s%s, resource-path, location);
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard http_fopen_wrapper.c
iliaa Wed Feb 19 19:34:04 2003 EDT
Modified files:
/php4/ext/standard http_fopen_wrapper.c
Log:
Revert accidental commit.
Index: php4/ext/standard/http_fopen_wrapper.c
diff -u php4/ext/standard/http_fopen_wrapper.c:1.65
php4/ext/standard/http_fopen_wrapper.c:1.66
--- php4/ext/standard/http_fopen_wrapper.c:1.65 Wed Feb 19 19:32:51 2003
+++ php4/ext/standard/http_fopen_wrapper.c Wed Feb 19 19:34:03 2003
@@ -18,7 +18,7 @@
| Wez Furlong [EMAIL PROTECTED] |
+--+
*/
-/* $Id: http_fopen_wrapper.c,v 1.65 2003/02/20 00:32:51 iliaa Exp $ */
+/* $Id: http_fopen_wrapper.c,v 1.66 2003/02/20 00:34:03 iliaa Exp $ */
#include php.h
#include php_globals.h
@@ -354,7 +354,7 @@
s = resource-path;
*s = '/';
}
- *(s + 1) = '\0';
+ s[1] = '\0';
if (resource-path
*(resource-path) == '/' *(resource-path + 1) == '\0') {
snprintf(loc_path,
sizeof(loc_path) - 1, %s%s, resource-path, location);
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard exec.c
iliaa Wed Feb 19 19:34:24 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/standard exec.c
Log:
MFH
Index: php4/ext/standard/exec.c
diff -u php4/ext/standard/exec.c:1.84.2.4 php4/ext/standard/exec.c:1.84.2.5
--- php4/ext/standard/exec.c:1.84.2.4 Tue Dec 31 11:35:27 2002
+++ php4/ext/standard/exec.cWed Feb 19 19:34:24 2003
@@ -15,7 +15,7 @@
| Author: Rasmus Lerdorf |
+--+
*/
-/* $Id: exec.c,v 1.84.2.4 2002/12/31 16:35:27 sebastian Exp $ */
+/* $Id: exec.c,v 1.84.2.5 2003/02/20 00:34:24 iliaa Exp $ */
#include stdio.h
#include php.h
@@ -276,11 +276,12 @@
RETVAL_STRINGL(buf, l, 1);
}
} else {
- int b, i;
+ size_t b;
- while ((b = fread(buf, 1, buflen, fp)) 0) {
- for (i = 0; i b; i++)
- if (output) (void)PUTC(buf[i]);
+ while ((b = fread(buf, buflen, 1, fp)) 0) {
+ if (output) {
+ PHPWRITE(buf, b);
+ }
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) / NEWS
iliaa Wed Feb 19 19:35:43 2003 EDT Modified files: (Branch: PHP_4_3) /php4 NEWS Log: Bug fixing news. Index: php4/NEWS diff -u php4/NEWS:1.1247.2.97 php4/NEWS:1.1247.2.98 --- php4/NEWS:1.1247.2.97 Wed Feb 19 19:15:55 2003 +++ php4/NEWS Wed Feb 19 19:35:42 2003 @@ -20,6 +20,7 @@ - Added improved JPEG 2000 support for getimagesize(). (Marcus, Adam Wright) - Added XBM and WBMP support for getimagesize(). (Marcus) - Fixed several errors in hwapi extension. Objects weren't handled properly. (Uwe) +- Fixed bug #22308 (optimized passthru, code is now ~40 times faster). (Ilia) - Fixed bug #22283 (possible crash when opening relative URLs). (Ilia) - Fixed bug #22234 (copy() fails if source file has 0 length). (Moriyoshi) - Fixed bug #7 (printf() field limiters broke between 4.2.3 and 4.3.0). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard dns.c
sniper Thu Feb 20 00:34:58 2003 EDT
Modified files:
/php4/ext/standard dns.c
Log:
- Fixed bug #22299 (gethostbyname() crash with non-existing domain on MacOSX)
Index: php4/ext/standard/dns.c
diff -u php4/ext/standard/dns.c:1.54 php4/ext/standard/dns.c:1.55
--- php4/ext/standard/dns.c:1.54Sat Feb 15 22:48:47 2003
+++ php4/ext/standard/dns.c Thu Feb 20 00:34:58 2003
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dns.c,v 1.54 2003/02/16 03:48:47 wez Exp $ */
+/* $Id: dns.c,v 1.55 2003/02/20 05:34:58 sniper Exp $ */
/* {{{ includes */
#include php.h
@@ -195,7 +195,7 @@
hp = gethostbyname(name);
- if (!hp || !hp-h_addr_list) {
+ if (!hp || !*(hp-h_addr_list)) {
return estrdup(name);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard dns.c
sniper Thu Feb 20 00:35:19 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/standard dns.c
Log:
MFH: - Fixed bug #22299 (gethostbyname() crash with non-existing domain on MacOSX)
Index: php4/ext/standard/dns.c
diff -u php4/ext/standard/dns.c:1.44.2.2 php4/ext/standard/dns.c:1.44.2.3
--- php4/ext/standard/dns.c:1.44.2.2Tue Dec 31 11:35:26 2002
+++ php4/ext/standard/dns.c Thu Feb 20 00:35:18 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dns.c,v 1.44.2.2 2002/12/31 16:35:26 sebastian Exp $ */
+/* $Id: dns.c,v 1.44.2.3 2003/02/20 05:35:18 sniper Exp $ */
/* {{{ includes
*/
@@ -197,7 +197,7 @@
hp = gethostbyname(name);
- if (!hp || !hp-h_addr_list) {
+ if (!hp || !*(hp-h_addr_list)) {
return estrdup(name);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) / NEWS
sniper Thu Feb 20 00:36:54 2003 EDT Modified files: (Branch: PHP_4_3) /php4 NEWS Log: BFN Index: php4/NEWS diff -u php4/NEWS:1.1247.2.98 php4/NEWS:1.1247.2.99 --- php4/NEWS:1.1247.2.98 Wed Feb 19 19:35:42 2003 +++ php4/NEWS Thu Feb 20 00:36:54 2003 @@ -21,6 +21,8 @@ - Added XBM and WBMP support for getimagesize(). (Marcus) - Fixed several errors in hwapi extension. Objects weren't handled properly. (Uwe) - Fixed bug #22308 (optimized passthru, code is now ~40 times faster). (Ilia) +- Fixed bug #22299 (gethostbyname() with non-existing domain crashed on MacOSX). + (Jani) - Fixed bug #22283 (possible crash when opening relative URLs). (Ilia) - Fixed bug #22234 (copy() fails if source file has 0 length). (Moriyoshi) - Fixed bug #7 (printf() field limiters broke between 4.2.3 and 4.3.0). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4) /ext/session session.c
sas Thu Feb 20 01:18:46 2003 EDT
Modified files: (Branch: PHP_4)
/php4/ext/session session.c
Log:
MFH urlencoding
Index: php4/ext/session/session.c
diff -u php4/ext/session/session.c:1.336.2.5.2.5
php4/ext/session/session.c:1.336.2.5.2.6
--- php4/ext/session/session.c:1.336.2.5.2.5Tue Feb 18 14:32:45 2003
+++ php4/ext/session/session.c Thu Feb 20 01:18:46 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.336.2.5.2.5 2003/02/18 19:32:45 sas Exp $ */
+/* $Id: session.c,v 1.336.2.5.2.6 2003/02/20 06:18:46 sas Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1043,7 +1043,7 @@
if (PS(apply_trans_sid)) {
php_url_scanner_reset_vars(TSRMLS_C);
- php_url_scanner_add_var(PS(session_name), strlen(PS(session_name)),
PS(id), strlen(PS(id)), 0 TSRMLS_CC);
+ php_url_scanner_add_var(PS(session_name), strlen(PS(session_name)),
+PS(id), strlen(PS(id)), 1 TSRMLS_CC);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/session php_session.h session.c
sas Thu Feb 20 01:24:08 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/session php_session.h session.c
Log:
MFH general urlencoding
MFH session_regenerate_id, a change which is as important as the former one
Index: php4/ext/session/php_session.h
diff -u php4/ext/session/php_session.h:1.84.2.2 php4/ext/session/php_session.h:1.84.2.3
--- php4/ext/session/php_session.h:1.84.2.2 Mon Feb 10 20:16:03 2003
+++ php4/ext/session/php_session.h Thu Feb 20 01:24:08 2003
@@ -118,6 +118,8 @@
zend_bool use_only_cookies;
zend_bool use_trans_sid;/* contains the INI value of whether to use
trans-sid */
zend_bool apply_trans_sid; /* whether or not to enable trans-sid for the
current request */
+ int send_cookie;
+ int define_sid;
} php_ps_globals;
typedef php_ps_globals zend_ps_globals;
@@ -129,6 +131,7 @@
PHP_FUNCTION(session_module_name);
PHP_FUNCTION(session_save_path);
PHP_FUNCTION(session_id);
+PHP_FUNCTION(session_regenerate_id);
PHP_FUNCTION(session_decode);
PHP_FUNCTION(session_register);
PHP_FUNCTION(session_unregister);
Index: php4/ext/session/session.c
diff -u php4/ext/session/session.c:1.336.2.6 php4/ext/session/session.c:1.336.2.7
--- php4/ext/session/session.c:1.336.2.6Mon Feb 10 20:16:03 2003
+++ php4/ext/session/session.c Thu Feb 20 01:24:08 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.336.2.6 2003/02/11 01:16:03 sas Exp $ */
+/* $Id: session.c,v 1.336.2.7 2003/02/20 06:24:08 sas Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -60,6 +60,7 @@
PHP_FE(session_module_name, NULL)
PHP_FE(session_save_path, NULL)
PHP_FE(session_id,NULL)
+ PHP_FE(session_regenerate_id, NULL)
PHP_FE(session_decode,NULL)
PHP_FE(session_register, NULL)
PHP_FE(session_unregister,NULL)
@@ -918,19 +919,47 @@
convert_to_string((*ppid)); \
PS(id) = estrndup(Z_STRVAL_PP(ppid), Z_STRLEN_PP(ppid))
+static void php_session_reset_id(TSRMLS_D)
+{
+ int module_number = PS(module_number);
+
+ if (PS(send_cookie)) {
+ php_session_send_cookie(TSRMLS_C);
+ }
+
+ /* if the SID constant exists, destroy it. */
+ zend_hash_del(EG(zend_constants), sid, sizeof(sid));
+
+ if (PS(define_sid)) {
+ smart_str var = {0};
+
+ smart_str_appends(var, PS(session_name));
+ smart_str_appendc(var, '=');
+ smart_str_appends(var, PS(id));
+ smart_str_0(var);
+ REGISTER_STRINGL_CONSTANT(SID, var.c, var.len, 0);
+ } else {
+ REGISTER_STRINGL_CONSTANT(SID, empty_string, 0, 0);
+ }
+
+ if (PS(apply_trans_sid)) {
+ php_url_scanner_reset_vars(TSRMLS_C);
+ php_url_scanner_add_var(PS(session_name), strlen(PS(session_name)),
+PS(id), strlen(PS(id)), 1 TSRMLS_CC);
+ }
+}
+
PHPAPI void php_session_start(TSRMLS_D)
{
zval **ppid;
zval **data;
char *p;
- int send_cookie = 1;
- int define_sid = 1;
- int module_number = PS(module_number);
int nrand;
int lensess;
PS(apply_trans_sid) = PS(use_trans_sid);
+ PS(define_sid) = 1;
+ PS(send_cookie) = 1;
if (PS(session_status) != php_session_none)
return;
@@ -950,8 +979,8 @@
lensess + 1, (void **) ppid) == SUCCESS) {
PPID2SID;
PS(apply_trans_sid) = 0;
- send_cookie = 0;
- define_sid = 0;
+ PS(send_cookie) = 0;
+ PS(define_sid) = 0;
}
if (!PS(use_only_cookies) !PS(id)
@@ -961,7 +990,7 @@
zend_hash_find(Z_ARRVAL_PP(data), PS(session_name),
lensess + 1, (void **) ppid) == SUCCESS) {
PPID2SID;
- send_cookie = 0;
+ PS(send_cookie) = 0;
}
if (!PS(use_only_cookies) !PS(id)
@@ -971,7 +1000,7 @@
zend_hash_find(Z_ARRVAL_PP(data), PS(session_name),
lensess + 1, (void **) ppid) == SUCCESS) {
PPID2SID;
- send_cookie = 0;
+ PS(send_cookie) = 0;
}
}
@@ -1004,42 +1033,22 @@
strstr(Z_STRVAL_PP(data), PS(extern_referer_chk)) == NULL) {
efree(PS(id));
PS(id) = NULL;
- send_cookie = 1;
+ PS(send_cookie) = 1;
if
[PHP-CVS] cvs: php4(PHP_4_3) / NEWS
sas Thu Feb 20 01:55:36 2003 EDT Modified files: (Branch: PHP_4_3) /php4 NEWS Log: update Index: php4/NEWS diff -u php4/NEWS:1.1247.2.99 php4/NEWS:1.1247.2.100 --- php4/NEWS:1.1247.2.99 Thu Feb 20 00:36:54 2003 +++ php4/NEWS Thu Feb 20 01:55:35 2003 @@ -1,6 +1,7 @@ PHP 4 NEWS ||| ?? ??? 2003, Version 4.3.2 +- Added session_regenerate_id(). (Sascha) - Enabled read-only GIF support in the bundled GDLIB (php_gd2.dll) on Windows. (Sebastian, Edin) - Improved dba extension (Marcus) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard md5.c sha1.c
derick Thu Feb 20 01:56:37 2003 EDT
Modified files:
/php4/ext/standard md5.c sha1.c
Log:
- No need to add the \0 ourselves, the estrndup in STRINGL takes care of
that for us.
Index: php4/ext/standard/md5.c
diff -u php4/ext/standard/md5.c:1.30 php4/ext/standard/md5.c:1.31
--- php4/ext/standard/md5.c:1.30Tue Feb 18 15:31:19 2003
+++ php4/ext/standard/md5.c Thu Feb 20 01:56:37 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: md5.c,v 1.30 2003/02/18 20:31:19 derick Exp $ */
+/* $Id: md5.c,v 1.31 2003/02/20 06:56:37 derick Exp $ */
/*
* md5.c - Copyright 1997 Lachlan Roche
@@ -49,7 +49,7 @@
zend_bool raw_output = 0;
char md5str[33];
PHP_MD5_CTX context;
- unsigned char digest[17];
+ unsigned char digest[16];
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|b, arg, arg_len,
raw_output) == FAILURE) {
return;
@@ -60,7 +60,6 @@
PHP_MD5Update(context, arg, arg_len);
PHP_MD5Final(digest, context);
if (raw_output) {
- digest[16] = '\0';
RETURN_STRINGL(digest, 16, 1);
} else {
make_digest(md5str, digest);
Index: php4/ext/standard/sha1.c
diff -u php4/ext/standard/sha1.c:1.5 php4/ext/standard/sha1.c:1.6
--- php4/ext/standard/sha1.c:1.5Tue Feb 18 15:31:19 2003
+++ php4/ext/standard/sha1.cThu Feb 20 01:56:37 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sha1.c,v 1.5 2003/02/18 20:31:19 derick Exp $ */
+/* $Id: sha1.c,v 1.6 2003/02/20 06:56:37 derick Exp $ */
#include stdio.h
#include php.h
@@ -46,7 +46,7 @@
zend_bool raw_output = 0;
char sha1str[41];
PHP_SHA1_CTX context;
- unsigned char digest[21];
+ unsigned char digest[20];
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|b, arg, arg_len,
raw_output) == FAILURE) {
return;
@@ -57,7 +57,6 @@
PHP_SHA1Update(context, arg, arg_len);
PHP_SHA1Final(digest, context);
if (raw_output) {
- digest[20] = '\0';
RETURN_STRINGL(digest, 20, 1);
} else {
make_sha1_digest(sha1str, digest);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 / NEWS
On Thu, 20 Feb 2003, Sascha Schumann wrote: sas Thu Feb 20 01:56:18 2003 EDT Modified files: /php4 NEWS Log: update Index: php4/NEWS diff -u php4/NEWS:1.1349 php4/NEWS:1.1350 --- php4/NEWS:1.1349 Wed Feb 19 20:33:17 2003 +++ php4/NEWS Thu Feb 20 01:56:18 2003 @@ -1,6 +1,7 @@ PHP 4 NEWS ||| ? ? ??? 200?, Version 5.0.0 +- Added session_regenerate_id(). (Sascha) It was added for 4.3.2, not for 5.0.0, so I don't see why it should be put here too? AFAIK the NEWS from the branch is merged into here too (usually by Jani). Derick -- Stop mad cowboy disease! - Derick Rethans http://derickrethans.nl/ PHP Magazine - PHP Magazine for Professionals http://php-mag.net/ - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / NEWS
sas Thu Feb 20 01:57:42 2003 EDT Modified files: /php4 NEWS Log: update Index: php4/NEWS diff -u php4/NEWS:1.1350 php4/NEWS:1.1351 --- php4/NEWS:1.1350Thu Feb 20 01:56:18 2003 +++ php4/NEWS Thu Feb 20 01:57:42 2003 @@ -2,6 +2,7 @@ ||| ? ? ??? 200?, Version 5.0.0 - Added session_regenerate_id(). (Sascha) +- Added session.hash_function and session.hash_bits_per_character. (Sascha) - Input Filter support added. See README.input_filter. (Rasmus) - Updated IFX_VERSION entry to work with new Version output of ESQL/C (Corne') - Moved extensions to PECL (http://pear.php.net/): (James, Tal) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/pgsql pgsql.c
sniper Thu Feb 20 02:10:07 2003 EDT
Modified files:
/php4/ext/pgsql pgsql.c
Log:
Fixed bug: #22306 (pg_lo_seek($h, 0, PGSQL_SEEK_SET) succeeds but returns false)
Index: php4/ext/pgsql/pgsql.c
diff -u php4/ext/pgsql/pgsql.c:1.261 php4/ext/pgsql/pgsql.c:1.262
--- php4/ext/pgsql/pgsql.c:1.261Mon Feb 10 10:46:47 2003
+++ php4/ext/pgsql/pgsql.c Thu Feb 20 02:10:07 2003
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: pgsql.c,v 1.261 2003/02/10 15:46:47 jon Exp $ */
+/* $Id: pgsql.c,v 1.262 2003/02/20 07:10:07 sniper Exp $ */
#include stdlib.h
@@ -2204,7 +2204,7 @@
ZEND_FETCH_RESOURCE(pgsql, pgLofp *, pgsql_id, -1, PostgreSQL large object,
le_lofp);
- if (lo_lseek((PGconn *)pgsql-conn, pgsql-lofd, offset, whence )) {
+ if (lo_lseek((PGconn *)pgsql-conn, pgsql-lofd, offset, whence ) -1) {
RETURN_TRUE;
} else {
RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/pgsql pgsql.c
sniper Thu Feb 20 02:10:49 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/pgsql pgsql.c
Log:
MFH: Fixed bug: #22306 (pg_lo_seek($h, 0, PGSQL_SEEK_SET) succeeds but returns false)
Index: php4/ext/pgsql/pgsql.c
diff -u php4/ext/pgsql/pgsql.c:1.244.2.9 php4/ext/pgsql/pgsql.c:1.244.2.10
--- php4/ext/pgsql/pgsql.c:1.244.2.9Sun Feb 9 02:50:31 2003
+++ php4/ext/pgsql/pgsql.c Thu Feb 20 02:10:48 2003
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: pgsql.c,v 1.244.2.9 2003/02/09 07:50:31 yohgaki Exp $ */
+/* $Id: pgsql.c,v 1.244.2.10 2003/02/20 07:10:48 sniper Exp $ */
#include stdlib.h
@@ -2204,7 +2204,7 @@
ZEND_FETCH_RESOURCE(pgsql, pgLofp *, pgsql_id, -1, PostgreSQL large object,
le_lofp);
- if (lo_lseek((PGconn *)pgsql-conn, pgsql-lofd, offset, whence )) {
+ if (lo_lseek((PGconn *)pgsql-conn, pgsql-lofd, offset, whence) -1) {
RETURN_TRUE;
} else {
RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / NEWS
sniper Thu Feb 20 02:13:59 2003 EDT Modified files: /php4 NEWS Log: This is added in 4.3.2 Index: php4/NEWS diff -u php4/NEWS:1.1351 php4/NEWS:1.1352 --- php4/NEWS:1.1351Thu Feb 20 01:57:42 2003 +++ php4/NEWS Thu Feb 20 02:13:59 2003 @@ -1,7 +1,6 @@ PHP 4 NEWS ||| ? ? ??? 200?, Version 5.0.0 -- Added session_regenerate_id(). (Sascha) - Added session.hash_function and session.hash_bits_per_character. (Sascha) - Input Filter support added. See README.input_filter. (Rasmus) - Updated IFX_VERSION entry to work with new Version output of ESQL/C (Corne') -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) / NEWS
sniper Thu Feb 20 02:14:24 2003 EDT Modified files: (Branch: PHP_4_3) /php4 NEWS Log: style fix Index: php4/NEWS diff -u php4/NEWS:1.1247.2.101 php4/NEWS:1.1247.2.102 --- php4/NEWS:1.1247.2.101 Thu Feb 20 02:12:02 2003 +++ php4/NEWS Thu Feb 20 02:14:23 2003 @@ -1,7 +1,6 @@ PHP 4 NEWS ||| ?? ??? 2003, Version 4.3.2 -- Added session_regenerate_id(). (Sascha) - Enabled read-only GIF support in the bundled GDLIB (php_gd2.dll) on Windows. (Sebastian, Edin) - Improved dba extension (Marcus) @@ -13,6 +12,7 @@ - Added man page for CLI version of PHP. (Marcus) - Added --clean option into phpize. (Jani) - Added --ldflags option into php-config. (Jani) +- Added session_regenerate_id() function. (Sascha) - Added zlib_get_coding_type() function which returns the coding type used for output compression. (Moriyoshi) - Added OCIPasswordChange() which allows renewing expired Oracle users. (Maxim) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
