[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Mon Mar 14 20:43:04 2005 EDT Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.1922r2=1.1923ty=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.1922 php-src/ChangeLog:1.1923 --- php-src/ChangeLog:1.1922Sun Mar 13 20:41:59 2005 +++ php-src/ChangeLog Mon Mar 14 20:43:00 2005 @@ -1,3 +1,113 @@ +2005-03-14 Greg Beaver [EMAIL PROTECTED] + +* pear/go-pear-list.php + pear/go-pear-list.php: + + this needs updating + +2005-03-14 Jani Taskinen [EMAIL PROTECTED] + +* configure.in: + - Fixed bug #32200 (prevent using both --with-apxs2 and --with-apxs2filter) + +* (PHP_4_3) + NEWS + ext/openssl/openssl.c + ext/openssl/openssl.c: + MFH: - Fixed bug #18613 (Multiple OUs in x509 certificate not handled + properly) + +* (PHP_5_0) + NEWS: + BFN + +* ext/openssl/openssl.c: + - Fixed bug #18613 (Multiple OUs in x509 certificate not handled properly) + +2005-03-14 Rasmus Lerdorf [EMAIL PROTECTED] + +* main/SAPI.c + main/SAPI.h + sapi/aolserver/aolserver.c + sapi/apache/mod_php5.c + sapi/apache2filter/sapi_apache2.c + sapi/apache2handler/sapi_apache2.c + sapi/apache_hooks/mod_php5.c + sapi/cgi/cgi_main.c + sapi/thttpd/thttpd.c + sapi/tux/php_tux.c: + Fix for bug #32263 + This adds proto_num to request_info. It is defaulted to HTTP 1.0 (1000) + such that it has a valid value even if the underlying sapi doesn't set it + correctly. It is then used to determine if a 302 or a 303 should be sent + on a Location redirect. Any non GET/HEAD HTTP 1.1 redirect will get a 303 + instead of a 302 to be compatible with the HTTP spec. + +2005-03-14 Zeev Suraski [EMAIL PROTECTED] + +* ZendEngine2/zend_ini.c: + Clarify logic + +* win32/registry.c: + Merge registry fix + +* (PHP_4_3) + win32/registry.c: + Fix an age old bug in parsing paths when reading + INI values from the registry + +2005-03-14 Anantha Kesari H Y [EMAIL PROTECTED] + +* (PHP_5_0) + ext/session/session.c: + NetWare specific stat structure changes + +* (PHP_5_0) + main/php.h: + PHP_OS and PHP_UNAME for NetWare are getting populated from the + ph_config.h(configure.in) + +* (PHP_5_0) + configure.in: + For cross compiler uname's output while running on build machine can not be + stored in PHP_OS and PHP_UNAME + +2005-03-14 Stanislav Malyshev [EMAIL PROTECTED] + +* ZendEngine2/zend_builtin_functions.c + ZendEngine2/zend_builtin_functions.c: + ws + +2005-03-14 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_4_3) + NEWS + ext/curl/curl.c: + MFH: - Fixed bug #30609 (cURL functions bypass open_basedir) + +* (PHP_5_0) + NEWS + ext/curl/interface.c + ext/curl/interface.c: + - Fixed bug #30609 (cURL functions bypass open_basedir) + +2005-03-14 Zeev Suraski [EMAIL PROTECTED] + +* (PHP_5_0) + NEWS: + RC1 + +2005-03-14 Jani Taskinen [EMAIL PROTECTED] + +* NEWS: + -sigh* + +2005-03-14 Moriyoshi Koizumi [EMAIL PROTECTED] + +* ext/xml/tests/bug32001.phpt + ext/xml/tests/bug32001.phpt: + - Turn off incorrect case folding to let test over. + 2005-03-13 Ilia Alshanetsky [EMAIL PROTECTED] * (PHP_4_3) @@ -1836,7 +1946,7 @@ ext/session/mod_mm.h ext/session/mod_user.h ext/session/php_session.h: - - Missing $Id: ChangeLog,v 1.1922 2005/03/14 01:41:59 changelog Exp $ tags + - Missing $Id: ChangeLog,v 1.1923 2005/03/15 01:43:00 changelog Exp $ tags * (PHP_4_3) ext/session/session.c: @@ -2317,7 +2427,7 @@ * (PHP_4_3) Zend/zend_ini_scanner.l: - Missing $Id: ChangeLog,v 1.1922 2005/03/14 01:41:59 changelog Exp $ tag + ws fix + Missing $Id: ChangeLog,v 1.1923 2005/03/15 01:43:00 changelog Exp $ tag + ws fix * ZendEngine2/zend_ini_scanner.l ZendEngine2/zend_ini_scanner.l: @@ -3791,7 +3901,7 @@ ext/standard/url_scanner_ex.c ext/standard/url_scanner_ex.h ext/standard/url_scanner_ex.re: - Missing $Id: ChangeLog,v 1.1922 2005/03/14 01:41:59 changelog Exp $ tag + Missing $Id: ChangeLog,v 1.1923 2005/03/15 01:43:00 changelog Exp $ tag * ext/standard/credits_ext.h ext/standard/credits_sapi.h:
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Mon Mar 14 20:43:32 2005 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.655r2=1.656ty=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.655 ZendEngine2/ChangeLog:1.656 --- ZendEngine2/ChangeLog:1.655 Sun Mar 13 20:42:08 2005 +++ ZendEngine2/ChangeLog Mon Mar 14 20:43:31 2005 @@ -1,3 +1,14 @@ +2005-03-14 Zeev Suraski [EMAIL PROTECTED] + +* zend_ini.c: + Clarify logic + +2005-03-14 Stanislav Malyshev [EMAIL PROTECTED] + +* zend_builtin_functions.c + zend_builtin_functions.c: + ws + 2005-03-13 Stanislav Malyshev [EMAIL PROTECTED] * zend_stream.c @@ -7367,7 +7378,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.655 2005/03/14 01:42:08 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.656 2005/03/15 01:43:31 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -9091,7 +9102,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.655 2005/03/14 01:42:08 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.656 2005/03/15 01:43:31 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS
zeevMon Mar 14 03:57:47 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS Log: RC1 http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.285r2=1.1760.2.286ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.285 php-src/NEWS:1.1760.2.286 --- php-src/NEWS:1.1760.2.285 Sun Mar 13 08:26:10 2005 +++ php-src/NEWSMon Mar 14 03:57:43 2005 @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 2005, PHP 5.0.4 +13 Mar 2005, PHP 5.0.4RC1 - Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony) - Added length and charsetnr for field array and object in mysqli. (Georg) - Added checks for negative values to gmp_sqrt(), gmp_powm(), gmp_sqrtrem() -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/curl curl.c
sniper Mon Mar 14 04:03:11 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/curl curl.c
Log:
MFH: - Fixed bug #30609 (cURL functions bypass open_basedir)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.854r2=1.1247.2.855ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.854 php-src/NEWS:1.1247.2.855
--- php-src/NEWS:1.1247.2.854 Sun Mar 13 15:18:42 2005
+++ php-src/NEWSMon Mar 14 04:03:08 2005
@@ -77,6 +77,7 @@
- Fixed bug #31055 (apache2filter: per request leak proportional to the full
path of the request URI). (kameshj at fastmail dot fm)
- Fixed bug #30726 (-.1 like numbers are not being handled correctly). (Ilia)
+- Fixed bug #30609 (cURL functions bypass open_basedir). (Jani)
- Fixed bug #30446 (apache2handler: virtual() includes files out of sequence)
- Fixed bug #30430 (odbc_next_result() doesn't bind values and that results
in segfault). (pdan-php at esync dot org, Tony)
http://cvs.php.net/diff.php/php-src/ext/curl/curl.c?r1=1.124.2.28r2=1.124.2.29ty=u
Index: php-src/ext/curl/curl.c
diff -u php-src/ext/curl/curl.c:1.124.2.28 php-src/ext/curl/curl.c:1.124.2.29
--- php-src/ext/curl/curl.c:1.124.2.28 Thu Jan 6 05:34:03 2005
+++ php-src/ext/curl/curl.c Mon Mar 14 04:03:09 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: curl.c,v 1.124.2.28 2005/01/06 10:34:03 jorton Exp $ */
+/* $Id: curl.c,v 1.124.2.29 2005/03/14 09:03:09 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -50,6 +50,7 @@
#include ext/standard/php_smart_str.h
#include ext/standard/info.h
#include ext/standard/file.h
+#include ext/standard/url.h
#include php_curl.h
static int le_curl;
@@ -64,6 +65,26 @@
#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);
+#define PHP_CURL_CHECK_OPEN_BASEDIR(str, len)
\
+ if (PG(open_basedir) *PG(open_basedir)
\
+ strncasecmp(str, file://, sizeof(file://) - 1) == 0)
\
+ {
\
+ php_url *tmp_url;
\
+
\
+ if (!(tmp_url = php_url_parse_ex(str, len))) {
\
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid
url '%s', str); \
+ RETURN_FALSE;
\
+ }
\
+
\
+ if (php_check_open_basedir(tmp_url-path TSRMLS_CC) ||
\
+ (PG(safe_mode) !php_checkuid(tmp_url-path, rb+,
CHECKUID_CHECK_MODE_PARAM)) \
+ ) {
\
+ php_url_free(tmp_url);
\
+ RETURN_FALSE;
\
+ }
\
+ php_url_free(tmp_url);
\
+ }
+
/* {{{ curl_functions[]
*/
function_entry curl_functions[] = {
@@ -682,6 +703,11 @@
[PHP-CVS] cvs: php-src(PHP_5_0) /main php.h
hyanantha Mon Mar 14 04:41:45 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/main php.h Log: PHP_OS and PHP_UNAME for NetWare are getting populated from the ph_config.h(configure.in) http://cvs.php.net/diff.php/php-src/main/php.h?r1=1.203.2.8r2=1.203.2.9ty=u Index: php-src/main/php.h diff -u php-src/main/php.h:1.203.2.8 php-src/main/php.h:1.203.2.9 --- php-src/main/php.h:1.203.2.8Thu Mar 10 06:32:36 2005 +++ php-src/main/php.h Mon Mar 14 04:41:39 2005 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php.h,v 1.203.2.8 2005/03/10 11:32:36 hyanantha Exp $ */ +/* $Id: php.h,v 1.203.2.9 2005/03/14 09:41:39 hyanantha Exp $ */ #ifndef PHP_H #define PHP_H @@ -65,16 +65,6 @@ #endif #endif -#ifdef NETWARE -/* For php_get_uname() function */ -#define PHP_UNAME NetWare -/* - * This is obtained using uname(2) on Unix and assigned in the case of Windows; - * we'll do it this way at least for now. - */ -#define PHP_OS PHP_UNAME -#endif - #include php_regex.h #if HAVE_ASSERT_H -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo_sqlite Makefile.frag config.m4
sniper Mon Mar 14 04:47:34 2005 EDT
Removed files:
/php-src/ext/pdo_sqlite Makefile.frag
Modified files:
/php-src/ext/pdo_sqlite config.m4
Log:
- Back to stone-age
http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/config.m4?r1=1.16r2=1.17ty=u
Index: php-src/ext/pdo_sqlite/config.m4
diff -u php-src/ext/pdo_sqlite/config.m4:1.16
php-src/ext/pdo_sqlite/config.m4:1.17
--- php-src/ext/pdo_sqlite/config.m4:1.16 Sun Mar 13 20:09:49 2005
+++ php-src/ext/pdo_sqlite/config.m4Mon Mar 14 04:47:31 2005
@@ -1,11 +1,11 @@
-dnl $Id: config.m4,v 1.16 2005/03/14 01:09:49 sniper Exp $
+dnl $Id: config.m4,v 1.17 2005/03/14 09:47:31 sniper Exp $
dnl config.m4 for extension pdo_sqlite
dnl vim:et:sw=2:ts=2:
if test $PHP_PDO != no; then
PHP_ARG_WITH(pdo-sqlite, for sqlite 3 driver for PDO,
-[ --with-pdo-sqlite[=DIR] Include PDO sqlite 3 support.],yes)
+[ --with-pdo-sqlite Include PDO sqlite 3 support],yes)
if test $PHP_PDO_SQLITE != no; then
@@ -83,14 +83,21 @@
PHP_ADD_BUILD_DIR($ext_builddir/sqlite)
PHP_ADD_BUILD_DIR($ext_builddir/sqlite/src)
- PHP_ADD_BUILD_DIR($ext_builddir/sqlite/tool)
- PHP_ADD_MAKEFILE_FRAGMENT
-
AC_CHECK_SIZEOF(char *,4)
AC_DEFINE(SQLITE_PTR_SZ, SIZEOF_CHAR_P, [Size of a pointer])
PDO_SQLITE_VERSION=`cat $ext_srcdir/sqlite/VERSION`
PDO_SQLITE_VERSION_NUMBER=`echo $PDO_SQLITE_VERSION | awk -F.
'{printf(%d%03d%03d, $1, $2, $3)}'`
sed -e s/--VERS--/$PDO_SQLITE_VERSION/ -e
s/--VERSION-NUMBER--/$PDO_SQLITE_VERSION_NUMBER/
$ext_srcdir/sqlite/src/sqlite.h.in $ext_srcdir/sqlite3.h
+ if ! test -f $ext_srcdir/sqlite/src/parse.h ; then
+$CC -o $ext_srcdir/sqlite/tool/lemon $ext_srcdir/sqlite/tool/lemon.c
+$ext_srcdir/sqlite/tool/lemon $ext_srcdir/sqlite/src/parse.y
+ cat $ext_srcdir/sqlite/src/parse.h $ext_srcdir/sqlite/src/vdbe.c
| awk -f $ext_srcdir/sqlite/mkopcodeh.awk $ext_srcdir/sqlite/src/opcodes.h
+sort -n +2 $ext_srcdir/sqlite/src/opcodes.h | awk -f
$ext_srcdir/sqlite/mkopcodec.awk $ext_srcdir/sqlite/src/opcodes.c
+$CC -o $ext_srcdir/sqlite/tool/mkkeywordhash
$ext_srcdir/sqlite/tool/mkkeywordhash.c
+$ext_srcdir/sqlite/tool/mkkeywordhash
$ext_srcdir/sqlite/src/keywordhash.h
+ else
+touch $ext_srcdir/sqlite/src/parse.c $ext_srcdir/sqlite/src/parse.y
+ fi
if test $ext_shared = no -o $ext_srcdir != $abs_srcdir; then
echo '#include php_config.h' $ext_srcdir/sqlite/src/config.h
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /win32 registry.c
zeevMon Mar 14 07:41:19 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/win32 registry.c
Log:
Fix an age old bug in parsing paths when reading
INI values from the registry
http://cvs.php.net/diff.php/php-src/win32/registry.c?r1=1.12.2.1r2=1.12.2.2ty=u
Index: php-src/win32/registry.c
diff -u php-src/win32/registry.c:1.12.2.1 php-src/win32/registry.c:1.12.2.2
--- php-src/win32/registry.c:1.12.2.1 Tue Mar 16 13:27:55 2004
+++ php-src/win32/registry.cMon Mar 14 07:41:18 2005
@@ -38,6 +38,9 @@
drive_letter = tmp_buf[0];
cwd++;
}
+ while (*cwd == '\\' || *cwd == '/') {
+ cwd++;
+ }
path = (char *)
emalloc(2+strlen(cwd)+1+strlen(orig_path)+1);
sprintf(path, %c\\%s\\%s, drive_letter, cwd,
orig_path);
efree(orig_path);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32 registry.c
zeevMon Mar 14 07:42:05 2005 EDT
Modified files:
/php-src/win32 registry.c
Log:
Merge registry fix
http://cvs.php.net/diff.php/php-src/win32/registry.c?r1=1.15r2=1.16ty=u
Index: php-src/win32/registry.c
diff -u php-src/win32/registry.c:1.15 php-src/win32/registry.c:1.16
--- php-src/win32/registry.c:1.15 Sun Oct 19 09:47:35 2003
+++ php-src/win32/registry.cMon Mar 14 07:42:05 2005
@@ -38,6 +38,9 @@
drive_letter = tmp_buf[0];
cwd++;
}
+ while (*cwd == '\\' || *cwd == '/') {
+ cwd++;
+ }
path = (char *)
emalloc(2+strlen(cwd)+1+strlen(orig_path)+1);
sprintf(path, %c\\%s\\%s, drive_letter, cwd,
orig_path);
efree(orig_path);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /win32 registry.c
zeevMon Mar 14 07:42:56 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/win32 registry.c
Log:
MFH
http://cvs.php.net/diff.php/php-src/win32/registry.c?r1=1.15r2=1.15.2.1ty=u
Index: php-src/win32/registry.c
diff -u php-src/win32/registry.c:1.15 php-src/win32/registry.c:1.15.2.1
--- php-src/win32/registry.c:1.15 Sun Oct 19 09:47:35 2003
+++ php-src/win32/registry.cMon Mar 14 07:42:55 2005
@@ -38,6 +38,9 @@
drive_letter = tmp_buf[0];
cwd++;
}
+ while (*cwd == '\\' || *cwd == '/') {
+ cwd++;
+ }
path = (char *)
emalloc(2+strlen(cwd)+1+strlen(orig_path)+1);
sprintf(path, %c\\%s\\%s, drive_letter, cwd,
orig_path);
efree(orig_path);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main SAPI.c SAPI.h /sapi/aolserver aolserver.c /sapi/apache mod_php5.c /sapi/apache2filter sapi_apache2.c /sapi/apache2handler sapi_apache2.c /sapi/apache_hooks mod_php5.c /sapi/cgi cgi_main.c /sapi/thttpd thttpd.c /sapi/tux php_tux.c
rasmus Mon Mar 14 14:25:40 2005 EDT
Modified files:
/php-src/main SAPI.c SAPI.h
/php-src/sapi/aolserver aolserver.c
/php-src/sapi/apachemod_php5.c
/php-src/sapi/apache2filter sapi_apache2.c
/php-src/sapi/apache2handlersapi_apache2.c
/php-src/sapi/apache_hooks mod_php5.c
/php-src/sapi/cgi cgi_main.c
/php-src/sapi/thttpdthttpd.c
/php-src/sapi/tux php_tux.c
Log:
Fix for bug #32263
This adds proto_num to request_info. It is defaulted to HTTP 1.0 (1000)
such that it has a valid value even if the underlying sapi doesn't set it
correctly. It is then used to determine if a 302 or a 303 should be sent
on a Location redirect. Any non GET/HEAD HTTP 1.1 redirect will get a 303
instead of a 302 to be compatible with the HTTP spec.
http://cvs.php.net/diff.php/php-src/main/SAPI.c?r1=1.198r2=1.199ty=u
Index: php-src/main/SAPI.c
diff -u php-src/main/SAPI.c:1.198 php-src/main/SAPI.c:1.199
--- php-src/main/SAPI.c:1.198 Sat Mar 12 07:03:50 2005
+++ php-src/main/SAPI.c Mon Mar 14 14:25:37 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: SAPI.c,v 1.198 2005/03/12 12:03:50 andrey Exp $ */
+/* $Id: SAPI.c,v 1.199 2005/03/14 19:25:37 rasmus Exp $ */
#include ctype.h
#include sys/stat.h
@@ -346,6 +346,7 @@
SG(request_info).current_user_length = 0;
SG(request_info).no_headers = 0;
SG(request_info).post_entry = NULL;
+ SG(request_info).proto_num = 1000; /* Default to HTTP 1.0 */
SG(global_request_time) = 0;
/* It's possible to override this general case in the activate()
callback, if
@@ -608,7 +609,14 @@
SG(sapi_headers).http_response_code
307)
SG(sapi_headers).http_response_code !=
201) {
/* Return a Found Redirect if one is
not already specified */
- sapi_update_response_code(302
TSRMLS_CC);
+ if(SG(request_info).proto_num 1000
+ SG(request_info).request_method
+
strcmp(SG(request_info).request_method, HEAD)
+
strcmp(SG(request_info).request_method, GET)) {
+ sapi_update_response_code(303
TSRMLS_CC);
+ } else {
+ sapi_update_response_code(302
TSRMLS_CC);
+ }
}
} else if (!STRCASECMP(header_line,
WWW-Authenticate)) { /* HTTP Authentication */
http://cvs.php.net/diff.php/php-src/main/SAPI.h?r1=1.111r2=1.112ty=u
Index: php-src/main/SAPI.h
diff -u php-src/main/SAPI.h:1.111 php-src/main/SAPI.h:1.112
--- php-src/main/SAPI.h:1.111 Mon Feb 21 10:14:02 2005
+++ php-src/main/SAPI.h Mon Mar 14 14:25:37 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: SAPI.h,v 1.111 2005/02/21 15:14:02 moriyoshi Exp $ */
+/* $Id: SAPI.h,v 1.112 2005/03/14 19:25:37 rasmus Exp $ */
#ifndef SAPI_H
#define SAPI_H
@@ -109,6 +109,7 @@
/* this is necessary for CLI module */
int argc;
char **argv;
+ int proto_num;
} sapi_request_info;
http://cvs.php.net/diff.php/php-src/sapi/aolserver/aolserver.c?r1=1.78r2=1.79ty=u
Index: php-src/sapi/aolserver/aolserver.c
diff -u php-src/sapi/aolserver/aolserver.c:1.78
php-src/sapi/aolserver/aolserver.c:1.79
--- php-src/sapi/aolserver/aolserver.c:1.78 Mon Dec 20 14:33:35 2004
+++ php-src/sapi/aolserver/aolserver.c Mon Mar 14 14:25:38 2005
@@ -22,7 +22,7 @@
* - CGI/1.1 conformance
*/
-/* $Id: aolserver.c,v 1.78 2004/12/20 19:33:35 rasmus Exp $ */
+/* $Id: aolserver.c,v 1.79 2005/03/14 19:25:38 rasmus Exp $ */
/* conflict between PHP and AOLserver headers */
#define Debug php_Debug
@@ -205,7 +205,7 @@
int i;
php_info_print_table_start();
- php_info_print_table_row(2, SAPI module version, $Id: aolserver.c,v
1.78 2004/12/20 19:33:35 rasmus Exp $);
+ php_info_print_table_row(2, SAPI module version, $Id: aolserver.c,v
1.79 2005/03/14 19:25:38 rasmus Exp $);
php_info_print_table_row(2, Build date, Ns_InfoBuildDate());
php_info_print_table_row(2, Config file path, Ns_InfoConfigFile());
php_info_print_table_row(2, Error Log path, Ns_InfoErrorLog());
@@ -444,6 +444,8 @@
root = Ns_PageRoot(server);
SG(request_info).request_uri = strdup(SG(request_info).path_translated
+ strlen(root));
SG(request_info).request_method = NSG(conn)-request-method;
+ if(NSG(conn)-request-version 1.0) SG(request_info).proto_num = 1001;
+ else
[PHP-CVS] cvs: CVSROOT / avail
wez Mon Mar 14 15:14:50 2005 EDT Modified files: /CVSROOTavail Log: mqseries karma for philippe http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.953r2=1.954ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.953 CVSROOT/avail:1.954 --- CVSROOT/avail:1.953 Fri Mar 11 22:00:32 2005 +++ CVSROOT/avail Mon Mar 14 15:14:49 2005 @@ -214,7 +214,7 @@ avail|mohrt|pear/Date avail|tal,momo|php-src/ext/calendar avail|momo|php-src/ext/standard -avail|mbretter|pecl/radius,pecl/mqseries +avail|mbretter,philippe|pecl/radius,pecl/mqseries avail|mcmontero|pecl/imagick avail|schst,lucamariano|pear/Net_Server avail|bjori|pear/Net_FTP -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/openssl openssl.c
sniper Mon Mar 14 16:00:04 2005 EDT
Modified files:
/php-src/ext/opensslopenssl.c
Log:
- Fixed bug #18613 (Multiple OUs in x509 certificate not handled properly)
http://cvs.php.net/diff.php/php-src/ext/openssl/openssl.c?r1=1.93r2=1.94ty=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.93 php-src/ext/openssl/openssl.c:1.94
--- php-src/ext/openssl/openssl.c:1.93 Wed Oct 27 07:07:25 2004
+++ php-src/ext/openssl/openssl.c Mon Mar 14 16:00:02 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: openssl.c,v 1.93 2004/10/27 11:07:25 wez Exp $ */
+/* $Id: openssl.c,v 1.94 2005/03/14 21:00:02 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -227,9 +227,9 @@
static void add_assoc_name_entry(zval * val, char * key, X509_NAME * name, int
shortname TSRMLS_DC)
{
- zval * subitem;
- int i;
- char * sn, * ln;
+ zval *subitem, *subentries;
+ int i, j = -1, last = -1, obj_cnt = 0;
+ char *sname;
int nid;
X509_NAME_ENTRY * ne;
ASN1_STRING * str;
@@ -241,14 +241,39 @@
for (i = 0; i X509_NAME_entry_count(name); i++) {
ne = X509_NAME_get_entry(name, i);
obj = X509_NAME_ENTRY_get_object(ne);
- str = X509_NAME_ENTRY_get_data(ne);
nid = OBJ_obj2nid(obj);
+ obj_cnt = 0;
+
if (shortname) {
- sn = (char*)OBJ_nid2sn(nid);
- add_assoc_stringl(subitem, sn, str-data, str-length,
1);
+ sname = (char *) OBJ_nid2sn(nid);
+ } else {
+ sname = (char *) OBJ_nid2ln(nid);
+ }
+
+ MAKE_STD_ZVAL(subentries);
+ array_init(subentries);
+
+ last = -1;
+ for (;;) {
+ j = X509_NAME_get_index_by_OBJ(name, obj, last);
+ if (j 0) {
+ if (last != -1) break;
+ } else {
+ obj_cnt++;
+ ne = X509_NAME_get_entry(name, j);
+ str = X509_NAME_ENTRY_get_data(ne);
+ add_next_index_stringl(subentries, str-data,
str-length, 1);
+ }
+ last = j;
+ }
+ i = last;
+
+ if (obj_cnt 1) {
+ add_assoc_zval_ex(subitem, sname, strlen(sname) + 1,
subentries);
} else {
- ln = (char*)OBJ_nid2ln(nid);
- add_assoc_stringl(subitem, ln, str-data, str-length,
1);
+ zval_dtor(subentries);
+ FREE_ZVAL(subentries);
+ add_assoc_stringl(subitem, sname, str-data,
str-length, 1);
}
}
zend_hash_update(HASH_OF(val), key, strlen(key) + 1, (void *)subitem,
sizeof(subitem), NULL);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/openssl openssl.c
sniper Mon Mar 14 16:00:22 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/opensslopenssl.c
Log:
MFH: - Fixed bug #18613 (Multiple OUs in x509 certificate not handled
properly)
http://cvs.php.net/diff.php/php-src/ext/openssl/openssl.c?r1=1.89.2.4r2=1.89.2.5ty=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.89.2.4
php-src/ext/openssl/openssl.c:1.89.2.5
--- php-src/ext/openssl/openssl.c:1.89.2.4 Wed Oct 27 07:07:49 2004
+++ php-src/ext/openssl/openssl.c Mon Mar 14 16:00:21 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: openssl.c,v 1.89.2.4 2004/10/27 11:07:49 wez Exp $ */
+/* $Id: openssl.c,v 1.89.2.5 2005/03/14 21:00:21 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -227,9 +227,9 @@
static void add_assoc_name_entry(zval * val, char * key, X509_NAME * name, int
shortname TSRMLS_DC)
{
- zval * subitem;
- int i;
- char * sn, * ln;
+ zval *subitem, *subentries;
+ int i, j = -1, last = -1, obj_cnt = 0;
+ char *sname;
int nid;
X509_NAME_ENTRY * ne;
ASN1_STRING * str;
@@ -241,14 +241,39 @@
for (i = 0; i X509_NAME_entry_count(name); i++) {
ne = X509_NAME_get_entry(name, i);
obj = X509_NAME_ENTRY_get_object(ne);
- str = X509_NAME_ENTRY_get_data(ne);
nid = OBJ_obj2nid(obj);
+ obj_cnt = 0;
+
if (shortname) {
- sn = (char*)OBJ_nid2sn(nid);
- add_assoc_stringl(subitem, sn, str-data, str-length,
1);
+ sname = (char *) OBJ_nid2sn(nid);
+ } else {
+ sname = (char *) OBJ_nid2ln(nid);
+ }
+
+ MAKE_STD_ZVAL(subentries);
+ array_init(subentries);
+
+ last = -1;
+ for (;;) {
+ j = X509_NAME_get_index_by_OBJ(name, obj, last);
+ if (j 0) {
+ if (last != -1) break;
+ } else {
+ obj_cnt++;
+ ne = X509_NAME_get_entry(name, j);
+ str = X509_NAME_ENTRY_get_data(ne);
+ add_next_index_stringl(subentries, str-data,
str-length, 1);
+ }
+ last = j;
+ }
+ i = last;
+
+ if (obj_cnt 1) {
+ add_assoc_zval_ex(subitem, sname, strlen(sname) + 1,
subentries);
} else {
- ln = (char*)OBJ_nid2ln(nid);
- add_assoc_stringl(subitem, ln, str-data, str-length,
1);
+ zval_dtor(subentries);
+ FREE_ZVAL(subentries);
+ add_assoc_stringl(subitem, sname, str-data,
str-length, 1);
}
}
zend_hash_update(HASH_OF(val), key, strlen(key) + 1, (void *)subitem,
sizeof(subitem), NULL);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS
sniper Mon Mar 14 16:00:30 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS Log: BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.287r2=1.1760.2.288ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.287 php-src/NEWS:1.1760.2.288 --- php-src/NEWS:1.1760.2.287 Mon Mar 14 04:02:42 2005 +++ php-src/NEWSMon Mar 14 16:00:29 2005 @@ -168,6 +168,8 @@ Benjamin Greiner) - Fixed bug #28041 (SOAP HTTP Digest Access Authentication). (Dmitry) - Fixed bug #27633 (Double \r problem on ftp_get in ASCII mode on Win32). (Ilia) +- Fixed bug #18613 (Multiple OUs in x509 certificate not handled properly). + (Jani) 15 Dec 2004, PHP 5.0.3 - Added the %F modifier to *printf to render a non-locale-aware representation -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/openssl openssl.c
sniper Mon Mar 14 16:01:03 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/opensslopenssl.c
Log:
MFH: - Fixed bug #18613 (Multiple OUs in x509 certificate not handled
properly)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.855r2=1.1247.2.856ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.855 php-src/NEWS:1.1247.2.856
--- php-src/NEWS:1.1247.2.855 Mon Mar 14 04:03:08 2005
+++ php-src/NEWSMon Mar 14 16:01:01 2005
@@ -100,6 +100,7 @@
- Fixed bug #28067 (partially incorrect utf8 to htmlentities mapping). (Derick,
Benjamin Greiner)
- Fixed bug #27633 (Double \r problem on ftp_get in ASCII mode on Win32).
(Ilia)
+- Fixed bug #18613 (Multiple OUs in x509 certificate not handled properly).
(Jani)
- Fixed bug #7782 (Cannot use PATH_INFO fully with php isapi). (Unknown)
15 Dec 2004, Version 4.3.10
http://cvs.php.net/diff.php/php-src/ext/openssl/openssl.c?r1=1.52.2.20r2=1.52.2.21ty=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.52.2.20
php-src/ext/openssl/openssl.c:1.52.2.21
--- php-src/ext/openssl/openssl.c:1.52.2.20 Thu Feb 17 04:26:10 2005
+++ php-src/ext/openssl/openssl.c Mon Mar 14 16:01:02 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: openssl.c,v 1.52.2.20 2005/02/17 09:26:10 sniper Exp $ */
+/* $Id: openssl.c,v 1.52.2.21 2005/03/14 21:01:02 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -208,9 +208,9 @@
static void add_assoc_name_entry(zval * val, char * key, X509_NAME * name, int
shortname TSRMLS_DC)
{
- zval * subitem;
- int i;
- char * sn, * ln;
+ zval *subitem, *subentries;
+ int i, j = -1, last = -1, obj_cnt = 0;
+ char *sname;
int nid;
X509_NAME_ENTRY * ne;
ASN1_STRING * str;
@@ -222,14 +222,39 @@
for (i = 0; i X509_NAME_entry_count(name); i++) {
ne = X509_NAME_get_entry(name, i);
obj = X509_NAME_ENTRY_get_object(ne);
- str = X509_NAME_ENTRY_get_data(ne);
nid = OBJ_obj2nid(obj);
+ obj_cnt = 0;
+
if (shortname) {
- sn = (char*)OBJ_nid2sn(nid);
- add_assoc_stringl(subitem, sn, str-data, str-length,
1);
+ sname = (char *) OBJ_nid2sn(nid);
+ } else {
+ sname = (char *) OBJ_nid2ln(nid);
+ }
+
+ MAKE_STD_ZVAL(subentries);
+ array_init(subentries);
+
+ last = -1;
+ for (;;) {
+ j = X509_NAME_get_index_by_OBJ(name, obj, last);
+ if (j 0) {
+ if (last != -1) break;
+ } else {
+ obj_cnt++;
+ ne = X509_NAME_get_entry(name, j);
+ str = X509_NAME_ENTRY_get_data(ne);
+ add_next_index_stringl(subentries, str-data,
str-length, 1);
+ }
+ last = j;
+ }
+ i = last;
+
+ if (obj_cnt 1) {
+ add_assoc_zval_ex(subitem, sname, strlen(sname) + 1,
subentries);
} else {
- ln = (char*)OBJ_nid2ln(nid);
- add_assoc_stringl(subitem, ln, str-data, str-length,
1);
+ zval_dtor(subentries);
+ FREE_ZVAL(subentries);
+ add_assoc_stringl(subitem, sname, str-data,
str-length, 1);
}
}
zend_hash_update(HASH_OF(val), key, strlen(key) + 1, (void *)subitem,
sizeof(subitem), NULL);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS configure.in
sniper Mon Mar 14 16:11:46 2005 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS configure.in Log: MFH http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.856r2=1.1247.2.857ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.856 php-src/NEWS:1.1247.2.857 --- php-src/NEWS:1.1247.2.856 Mon Mar 14 16:01:01 2005 +++ php-src/NEWSMon Mar 14 16:11:44 2005 @@ -17,6 +17,8 @@ - Fixed several leaks in ext/filepro. (Tony) - Fixed build system to always use bundled libtool files. (Jani) - Fixed MacOSX shared extensions crashing on Apache startup. (Rasmus) +- Fixed bug #32200 (Prevent using both --with-apxs2 and --with-apxs2filter). + (Jani) - Fixed bug #32160 (file truncation in copy() when source destination are the same). (Ilia) - Fixed bug #31960 (msql_fetch_row() and msql_fetch_array() dropping columns http://cvs.php.net/diff.php/php-src/configure.in?r1=1.396.2.154r2=1.396.2.155ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.396.2.154 php-src/configure.in:1.396.2.155 --- php-src/configure.in:1.396.2.154Sun Mar 13 16:54:54 2005 +++ php-src/configure.inMon Mar 14 16:11:45 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.154 2005/03/13 21:54:54 iliaa Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.155 2005/03/14 21:11:45 sniper Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -81,6 +81,10 @@ AC_MSG_ERROR([--with-apache and --with-apxs cannot be used together]) fi +if test -n $with_apxs2filter test -n $with_apxs2; then + AC_MSG_ERROR([--with-apxs2filter and --with-apxs2 cannot be used together]) +fi + dnl Settings we want to make before the checks. dnl - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
sniper Mon Mar 14 16:11:36 2005 EDT Modified files: /php-srcconfigure.in Log: - Fixed bug #32200 (prevent using both --with-apxs2 and --with-apxs2filter) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.542r2=1.543ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.542 php-src/configure.in:1.543 --- php-src/configure.in:1.542 Thu Feb 24 14:27:10 2005 +++ php-src/configure.inMon Mar 14 16:11:33 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.542 2005/02/24 19:27:10 sniper Exp $ -*- autoconf -*- +dnl ## $Id: configure.in,v 1.543 2005/03/14 21:11:33 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -82,7 +82,11 @@ AC_MSG_ERROR([--with-apache and --with-apxs cannot be used together]) fi +if test -n $with_apxs2filter test -n $with_apxs2; then + AC_MSG_ERROR([--with-apxs2filter and --with-apxs2 cannot be used together]) +fi + dnl Settings we want to make before the checks. dnl - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS configure.in
sniper Mon Mar 14 16:12:27 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS configure.in Log: MFH http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.288r2=1.1760.2.289ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.288 php-src/NEWS:1.1760.2.289 --- php-src/NEWS:1.1760.2.288 Mon Mar 14 16:00:29 2005 +++ php-src/NEWSMon Mar 14 16:12:25 2005 @@ -11,13 +11,13 @@ - Updated bundled oniguruma library (used for multibyte regular expression) to 3.7.0. (Moriyoshi) - Updated bundled libmbfl library (used for multibyte functions). (Moriyoshi) -- Fixed bug preventing from building oci8 as shared. - (stanislav dot voroniy at portavita dot nl, Tony) Fixed bugs: . Bug #32063 (mb_convert_encoding ignores named entity 'alpha') . Bug #31911 (mb_decode_mimeheader() is case-sensitive to hex escapes) . bug #30573 (compiler warnings in libmbfl due to invalid type cast) . Bug #30549 (incorrect character translations for some ISO8859 charsets). +- Fixed bug preventing from building oci8 as shared. + (stanislav dot voroniy at portavita dot nl, Tony) - Fixed a bug in mysql_affected_rows and mysql_stmt_affected_rows when the api function returns -1 (Georg) - Fixed several leaks in ext/browscap and sapi/embed. (Andrei) @@ -33,6 +33,8 @@ child class). (Marcus) - Fixed bug #32238 (spl_array.c: void function cannot return value). (Johannes) - Fixed bug #32210 (proc_get_status() sets running always to true). (Ilia) +- Fixed bug #32200 (Prevent using both --with-apxs2 and --with-apxs2filter). + (Jani) - Fixed bug #32160 (file truncation in copy() when source destination are the same). (Ilia) - Fixed bug #32134 (Overloading offsetGet/offsetSet). (Marcus) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.514.2.39r2=1.514.2.40ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.514.2.39 php-src/configure.in:1.514.2.40 --- php-src/configure.in:1.514.2.39 Mon Mar 14 04:33:15 2005 +++ php-src/configure.inMon Mar 14 16:12:26 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.514.2.39 2005/03/14 09:33:15 hyanantha Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.514.2.40 2005/03/14 21:12:26 sniper Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -81,7 +81,11 @@ AC_MSG_ERROR([--with-apache and --with-apxs cannot be used together]) fi +if test -n $with_apxs2filter test -n $with_apxs2; then + AC_MSG_ERROR([--with-apxs2filter and --with-apxs2 cannot be used together]) +fi + dnl Settings we want to make before the checks. dnl - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /pear go-pear-list.php
cellog Mon Mar 14 18:57:07 2005 EDT Modified files: /php-src/pear go-pear-list.php Log: this needs updating http://cvs.php.net/diff.php/php-src/pear/go-pear-list.php?r1=1.11r2=1.12ty=u Index: php-src/pear/go-pear-list.php diff -u php-src/pear/go-pear-list.php:1.11 php-src/pear/go-pear-list.php:1.12 --- php-src/pear/go-pear-list.php:1.11 Fri Feb 25 20:27:49 2005 +++ php-src/pear/go-pear-list.php Mon Mar 14 18:57:07 2005 @@ -3,19 +3,19 @@ * that will be used to create the PEAR folder * in the windows snapshot. * See win32/build/mkdist.php for more details - * $Id: go-pear-list.php,v 1.11 2005/02/26 01:27:49 cellog Exp $ + * $Id: go-pear-list.php,v 1.12 2005/03/14 23:57:07 cellog Exp $ */ $packages = array( // required packages for the installer PEAR =1.3.5, -XML_RPC =1.1.0, +XML_RPC =1.2.2, Console_Getopt=1.2, -Archive_Tar =1.2, +Archive_Tar =1.3.0, // required packages for the web frontend PEAR_Frontend_Web =0.4, HTML_Template_IT =1.1, -Net_UserAgent_Detect =1.0, +Net_UserAgent_Detect =2.0.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) /pear go-pear-list.php
cellog Mon Mar 14 19:11:47 2005 EDT Added files: (Branch: PHP_4_3) /php-src/pear go-pear-list.php Log: add go-pear-list (probably won't do anything, but it's worth a try) http://cvs.php.net/co.php/php-src/pear/go-pear-list.php?r=1.1p=1 Index: php-src/pear/go-pear-list.php +++ php-src/pear/go-pear-list.php ?php /* This is a list of packages and versions * that will be used to create the PEAR folder * in the windows snapshot. * See win32/build/mkdist.php for more details * $Id: go-pear-list.php,v 1.1 2004/04/08 13:32:50 wez Exp $ */ $packages = array( PEAR = 1.3b6, Mail = 1.1.2, Net_SMTP = 1.2.2, Net_Socket= 1.0.1, PHPUnit = 1.0.0alpha3, Console_Getopt= 1.2, DB= 1.6.0RC6, HTTP = 1.2.2, Archive_Tar = 1.1, Pager = 1.0.8, HTML_Template_IT = 1.1, XML_Parser= 1.0.1, XML_RPC = 1.0.4, Net_UserAgent_Detect = 1.0, PEAR_Frontend_Web = 0.1 ); ? -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/openssl openssl.c
iliaa Mon Mar 14 19:27:52 2005 EDT
Modified files:
/php-src/ext/opensslopenssl.c
Log:
Fixed possible usage of str without being initialized.
http://cvs.php.net/diff.php/php-src/ext/openssl/openssl.c?r1=1.94r2=1.95ty=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.94 php-src/ext/openssl/openssl.c:1.95
--- php-src/ext/openssl/openssl.c:1.94 Mon Mar 14 16:00:02 2005
+++ php-src/ext/openssl/openssl.c Mon Mar 14 19:27:51 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: openssl.c,v 1.94 2005/03/14 21:00:02 sniper Exp $ */
+/* $Id: openssl.c,v 1.95 2005/03/15 00:27:51 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -273,7 +273,9 @@
} else {
zval_dtor(subentries);
FREE_ZVAL(subentries);
- add_assoc_stringl(subitem, sname, str-data,
str-length, 1);
+ if (obj_cnt) {
+ add_assoc_stringl(subitem, sname, str-data,
str-length, 1);
+ }
}
}
zend_hash_update(HASH_OF(val), key, strlen(key) + 1, (void *)subitem,
sizeof(subitem), NULL);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/openssl openssl.c
iliaa Mon Mar 14 19:29:36 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/opensslopenssl.c
Log:
MFH: Fixed possible usage of str without being initialized.
http://cvs.php.net/diff.php/php-src/ext/openssl/openssl.c?r1=1.89.2.5r2=1.89.2.6ty=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.89.2.5
php-src/ext/openssl/openssl.c:1.89.2.6
--- php-src/ext/openssl/openssl.c:1.89.2.5 Mon Mar 14 16:00:21 2005
+++ php-src/ext/openssl/openssl.c Mon Mar 14 19:29:36 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: openssl.c,v 1.89.2.5 2005/03/14 21:00:21 sniper Exp $ */
+/* $Id: openssl.c,v 1.89.2.6 2005/03/15 00:29:36 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -273,7 +273,9 @@
} else {
zval_dtor(subentries);
FREE_ZVAL(subentries);
- add_assoc_stringl(subitem, sname, str-data,
str-length, 1);
+ if (obj_cnt) {
+ add_assoc_stringl(subitem, sname, str-data,
str-length, 1);
+ }
}
}
zend_hash_update(HASH_OF(val), key, strlen(key) + 1, (void *)subitem,
sizeof(subitem), NULL);
--
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/openssl openssl.c
iliaa Mon Mar 14 19:30:04 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/opensslopenssl.c
Log:
MFH: Fixed possible usage of str without being initialized.
http://cvs.php.net/diff.php/php-src/ext/openssl/openssl.c?r1=1.52.2.21r2=1.52.2.22ty=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.52.2.21
php-src/ext/openssl/openssl.c:1.52.2.22
--- php-src/ext/openssl/openssl.c:1.52.2.21 Mon Mar 14 16:01:02 2005
+++ php-src/ext/openssl/openssl.c Mon Mar 14 19:30:02 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: openssl.c,v 1.52.2.21 2005/03/14 21:01:02 sniper Exp $ */
+/* $Id: openssl.c,v 1.52.2.22 2005/03/15 00:30:02 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -254,7 +254,9 @@
} else {
zval_dtor(subentries);
FREE_ZVAL(subentries);
- add_assoc_stringl(subitem, sname, str-data,
str-length, 1);
+ if (obj_cnt) {
+ add_assoc_stringl(subitem, sname, str-data,
str-length, 1);
+ }
}
}
zend_hash_update(HASH_OF(val), key, strlen(key) + 1, (void *)subitem,
sizeof(subitem), NULL);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
