date:20030223

[PHP-CVS-DAILY] cvs: php4 / ChangeLog

2003-02-23 Thread changelog

changelog   Sun Feb 23 20:32:05 2003 EDT

  Modified files:  
/php4   ChangeLog 
  Log:
  ChangeLog update
  
Index: php4/ChangeLog
diff -u php4/ChangeLog:1.1275 php4/ChangeLog:1.1276
--- php4/ChangeLog:1.1275   Sat Feb 22 20:31:45 2003
+++ php4/ChangeLog  Sun Feb 23 20:32:04 2003
@@ -1,3 +1,71 @@
+2003-02-23  Jani Taskinen  [EMAIL PROTECTED]
+
+* main/fopen_wrappers.c:
+  MFB: Fix for open_basedir error message
+
+2003-02-23  Rasmus Lerdorf  [EMAIL PROTECTED]
+
+* (PHP_4_3)
+  main/fopen_wrappers.c
+  main/streams.c:
+  open_basedir fixes from David Saez
+
+2003-02-23  Stig Bakken  [EMAIL PROTECTED]
+
+* pear/packages/XML_Parser-1.0.1.tar
+  pear/packages/XML_Parser-1.0.tar:
+  
+  - upgrading XML_Parser to 1.0.1
+
+2003-02-23  Jani Taskinen  [EMAIL PROTECTED]
+
+* sapi/apache/libpre.c
+  sapi/apache/php_apache_http.h:
+  Added missing headers and $Id: ChangeLog,v 1.1276 2003/02/24 01:32:04 changelog 
Exp $ tags.
+
+* sapi/cgi/config9.m4:
+  MFB: Fixed bug #22356 (Do not add empty -I flags).
+
+* (PHP_4_3)
+  sapi/cgi/config9.m4:
+  Fixed bug #22356 (Do not add empty -I flags).
+
+* ext/imap/config.m4:
+  Fix for bug #22353
+
+* (PHP_4_3)
+  NEWS:
+  BFN
+
+* (PHP_4_3)
+  sapi/apache/config.m4
+  sapi/apache2filter/config.m4:
+  MFH: - Fixed bug #22376 (wrong httpd.conf modified when using INSTALL_ROOT)
+
+* sapi/apache/config.m4
+  sapi/apache2filter/config.m4
+  sapi/apache2handler/config.m4:
+  - Fixed bug #22376 (wrong httpd.conf modified when using INSTALL_ROOT)
+
+2003-02-23  Marcus Boerger  [EMAIL PROTECTED]
+
+* tests/classes/abstract_inherit.phpt:
+  New test which currently fails
+
+* NEWS:
+  Fix the name
+
+2003-02-23  Jani Taskinen  [EMAIL PROTECTED]
+
+* sapi/apache2filter/EXPERIMENTAL
+  sapi/apache2handler/EXPERIMENTAL:
+  
+  These both are experimental still. (there has been a note in config.m4
+  all the time but these marker files were missing)
+
+* NEWS:
+  Style
+
 2003-02-22  Marcus Boerger  [EMAIL PROTECTED]
 
 * ext/dba/libinifile/inifile.c:
@@ -512,7 +580,7 @@
   main/streams/plain_wrapper.c
   main/streams/streams.c
   main/streams/userspace.c:
-  ws fixes + missing $Id: ChangeLog,v 1.1275 2003/02/23 01:31:45 changelog Exp $ 
tags, headers added
+  ws fixes + missing $Id: ChangeLog,v 1.1276 2003/02/24 01:32:04 changelog Exp $ 
tags, headers added
 
 2003-02-19  Corne' Cornelius  [EMAIL PROTECTED]
 
@@ -1430,7 +1498,7 @@
 
 * (PHP_4_3)
   sapi/cgi/cgi_main.c:
-  Added missing $Id: ChangeLog,v 1.1275 2003/02/23 01:31:45 changelog Exp $ tag
+  Added missing $Id: ChangeLog,v 1.1276 2003/02/24 01:32:04 changelog Exp $ tag
 
 2003-02-14  Thies C. Arntzen  [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 /ext/imap config.m4

2003-02-23 Thread Jani Taskinen

sniper  Sun Feb 23 03:14:25 2003 EDT

  Modified files:  
/php4/ext/imap  config.m4 
  Log:
  Fix for bug #22353
  
Index: php4/ext/imap/config.m4
diff -u php4/ext/imap/config.m4:1.52 php4/ext/imap/config.m4:1.53
--- php4/ext/imap/config.m4:1.52Tue Jan 28 01:56:32 2003
+++ php4/ext/imap/config.m4 Sun Feb 23 03:14:25 2003
 -1,5 +1,5 
 dnl
-dnl $Id: config.m4,v 1.52 2003/01/28 06:56:32 sniper Exp $
+dnl $Id: config.m4,v 1.53 2003/02/23 08:14:25 sniper Exp $
 dnl
 
 AC_DEFUN(IMAP_INC_CHK,[if test -r $i$1/c-client.h; then
 -211,7 +211,7 
 ], [], $TST_LIBS)
 
 AC_MSG_CHECKING(whether IMAP works)
-PHP_IMAP_TEST_BUILD(mail_open, [
+PHP_IMAP_TEST_BUILD(mail_newbody, [
   AC_MSG_RESULT(yes)
 ], [
   AC_MSG_RESULT(no)



-- 
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/imap config.m4

2003-02-23 Thread Jani Taskinen

sniper  Sun Feb 23 03:14:34 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/imap  config.m4 
  Log:
  MFH
  
Index: php4/ext/imap/config.m4
diff -u php4/ext/imap/config.m4:1.49.2.2 php4/ext/imap/config.m4:1.49.2.3
--- php4/ext/imap/config.m4:1.49.2.2Tue Jan 28 01:56:42 2003
+++ php4/ext/imap/config.m4 Sun Feb 23 03:14:34 2003
 -1,5 +1,5 
 dnl
-dnl $Id: config.m4,v 1.49.2.2 2003/01/28 06:56:42 sniper Exp $
+dnl $Id: config.m4,v 1.49.2.3 2003/02/23 08:14:34 sniper Exp $
 dnl
 
 AC_DEFUN(IMAP_INC_CHK,[if test -r $i$1/c-client.h; then
 -211,7 +211,7 
 ], [], $TST_LIBS)
 
 AC_MSG_CHECKING(whether IMAP works)
-PHP_IMAP_TEST_BUILD(mail_open, [
+PHP_IMAP_TEST_BUILD(mail_newbody, [
   AC_MSG_RESULT(yes)
 ], [
   AC_MSG_RESULT(no)



-- 
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/cgi config9.m4

2003-02-23 Thread Jani Taskinen

sniper  Sun Feb 23 04:36:47 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/sapi/cgi  config9.m4 
  Log:
  Fixed bug #22356 (Do not add empty -I flags).
  
Index: php4/sapi/cgi/config9.m4
diff -u php4/sapi/cgi/config9.m4:1.1.2.3 php4/sapi/cgi/config9.m4:1.1.2.4
--- php4/sapi/cgi/config9.m4:1.1.2.3Thu Dec 19 11:55:57 2002
+++ php4/sapi/cgi/config9.m4Sun Feb 23 04:36:47 2003
 -1,5 +1,5 
 dnl
-dnl $Id: config9.m4,v 1.1.2.3 2002/12/19 16:55:57 edink Exp $
+dnl $Id: config9.m4,v 1.1.2.4 2003/02/23 09:36:47 sniper Exp $
 dnl
 
 AC_ARG_ENABLE(cgi,
 -135,7 +135,7 
 if test $PHP_ENABLE_FASTCGI = yes; then
   PHP_FASTCGI=1
   PHP_FCGI_FILES=libfcgi/fcgi_stdio.c libfcgi/fcgiapp.c libfcgi/os_unix.c
-  PHP_FCGI_INCLUDE=$PHP_LIBFCGI_DIR/include
+  PHP_FCGI_INCLUDE=-I$PHP_LIBFCGI_DIR/include
   PHP_FCGI_STATIC=1
 else
   PHP_FASTCGI=0
 -148,7 +148,7 
 AC_MSG_RESULT($PHP_ENABLE_FASTCGI)
 
 INSTALL_IT=\$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/php
-PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c, 
-I$PHP_FCGI_INCLUDE,'$(SAPI_CGI_PATH)')
+PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c, 
$PHP_FCGI_INCLUDE, '$(SAPI_CGI_PATH)')
 
 case $host_alias in
   *darwin*)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /sapi/cgi config9.m4

2003-02-23 Thread Jani Taskinen

sniper  Sun Feb 23 04:37:13 2003 EDT

  Modified files:  
/php4/sapi/cgi  config9.m4 
  Log:
  MFB: Fixed bug #22356 (Do not add empty -I flags).
  
Index: php4/sapi/cgi/config9.m4
diff -u php4/sapi/cgi/config9.m4:1.5 php4/sapi/cgi/config9.m4:1.6
--- php4/sapi/cgi/config9.m4:1.5Thu Dec 19 12:02:40 2002
+++ php4/sapi/cgi/config9.m4Sun Feb 23 04:37:13 2003
 -1,5 +1,5 
 dnl
-dnl $Id: config9.m4,v 1.5 2002/12/19 17:02:40 edink Exp $
+dnl $Id: config9.m4,v 1.6 2003/02/23 09:37:13 sniper Exp $
 dnl
 
 AC_ARG_ENABLE(cgi,
 -135,7 +135,7 
 if test $PHP_ENABLE_FASTCGI = yes; then
   PHP_FASTCGI=1
   PHP_FCGI_FILES=libfcgi/fcgi_stdio.c libfcgi/fcgiapp.c libfcgi/os_unix.c
-  PHP_FCGI_INCLUDE=$PHP_LIBFCGI_DIR/include
+  PHP_FCGI_INCLUDE=-I$PHP_LIBFCGI_DIR/include
   PHP_FCGI_STATIC=1
 else
   PHP_FASTCGI=0
 -148,7 +148,7 
 AC_MSG_RESULT($PHP_ENABLE_FASTCGI)
 
 INSTALL_IT=\$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/php
-PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c, 
-I$PHP_FCGI_INCLUDE,'$(SAPI_CGI_PATH)')
+PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c, 
$PHP_FCGI_INCLUDE, '$(SAPI_CGI_PATH)')
 
 case $host_alias in
   *darwin*)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /sapi/apache libpre.c php_apache_http.h

2003-02-23 Thread Jani Taskinen

sniper  Sun Feb 23 04:50:43 2003 EDT

  Modified files:  
/php4/sapi/apache   libpre.c php_apache_http.h 
  Log:
  Added missing headers and $Id$ tags.
  
Index: php4/sapi/apache/libpre.c
diff -u php4/sapi/apache/libpre.c:1.2 php4/sapi/apache/libpre.c:1.3
--- php4/sapi/apache/libpre.c:1.2   Fri Jan  3 10:39:43 2003
+++ php4/sapi/apache/libpre.c   Sun Feb 23 04:50:43 2003
 -1,3 +1,22 
+/*
+  +--+
+  | 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.   |
+  +--+
+  | Author:  |
+  +--+
+*/
+
+/* $Id: libpre.c,v 1.3 2003/02/23 09:50:43 sniper Exp $ */
 
 #ifdef NETWARE
 
Index: php4/sapi/apache/php_apache_http.h
diff -u php4/sapi/apache/php_apache_http.h:1.5 php4/sapi/apache/php_apache_http.h:1.6
--- php4/sapi/apache/php_apache_http.h:1.5  Mon Feb 17 08:29:58 2003
+++ php4/sapi/apache/php_apache_http.h  Sun Feb 23 04:50:43 2003
 -1,3 +1,25 
+/*
+  +--+
+  | 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: Rasmus Lerdorf [EMAIL PROTECTED]   |
+  |  Stig Sæther Bakken [EMAIL PROTECTED]|
+  |  David Sklar [EMAIL PROTECTED] |
+  +--+
+*/
+
+/* $Id: php_apache_http.h,v 1.6 2003/02/23 09:50:43 sniper Exp $ */
+
 #define NO_REGEX_EXTRA_H
 
 #ifdef WIN32



-- 
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 fopen_wrappers.c streams.c

2003-02-23 Thread Rasmus Lerdorf

rasmus  Sun Feb 23 17:03:55 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/main  fopen_wrappers.c streams.c 
  Log:
  open_basedir fixes from David Saez
  
  
Index: php4/main/fopen_wrappers.c
diff -u php4/main/fopen_wrappers.c:1.153.2.2 php4/main/fopen_wrappers.c:1.153.2.3
--- php4/main/fopen_wrappers.c:1.153.2.2Tue Dec 31 11:25:01 2002
+++ php4/main/fopen_wrappers.c  Sun Feb 23 17:03:54 2003
@@ -16,7 +16,7 @@
|  Jim Winstead [EMAIL PROTECTED] |
+--+
  */
-/* $Id: fopen_wrappers.c,v 1.153.2.2 2002/12/31 16:25:01 sebastian Exp $ */
+/* $Id: fopen_wrappers.c,v 1.153.2.3 2003/02/23 22:03:54 rasmus Exp $ */
 
 /* {{{ includes
  */
@@ -192,7 +192,7 @@
ptr = end;
}
php_error_docref(NULL TSRMLS_CC, E_WARNING, 
-   open_basedir restriction in effect. File(%s) is not within 
the allowed path(s): (%s), path, pathbuf);
+   open_basedir restriction in effect. File(%s) is not within 
the allowed path(s): (%s), path, PG(open_basedir));
efree(pathbuf);
errno = EPERM; /* we deny permission to open it */
return -1;
Index: php4/main/streams.c
diff -u php4/main/streams.c:1.125.2.33 php4/main/streams.c:1.125.2.34
--- php4/main/streams.c:1.125.2.33  Fri Feb 21 21:43:58 2003
+++ php4/main/streams.c Sun Feb 23 17:03:54 2003
@@ -20,7 +20,7 @@
+--+
  */
 
-/* $Id: streams.c,v 1.125.2.33 2003/02/22 02:43:58 wez Exp $ */
+/* $Id: streams.c,v 1.125.2.34 2003/02/23 22:03:54 rasmus Exp $ */
 
 #define _GNU_SOURCE
 #include php.h
@@ -1763,6 +1763,12 @@
end++;
}
snprintf(trypath, MAXPATHLEN, %s/%s, ptr, filename);
+
+   /* If file does not exist continue */
+   if (VCWD_STAT(trypath, sb) != 0) {
+   ptr = end;
+   continue;
+   }

if (php_check_open_basedir(trypath TSRMLS_CC)) {
stream = NULL;
@@ -1770,17 +1776,15 @@
}

if (PG(safe_mode)) {
-   if (VCWD_STAT(trypath, sb) == 0) {
-   /* file exists ... check permission */
-   if ((php_check_safe_mode_include_dir(trypath 
TSRMLS_CC) == 0) ||
-   php_checkuid(trypath, mode, 
CHECKUID_CHECK_MODE_PARAM)) {
-   /* UID ok, or trypath is in 
safe_mode_include_dir */
-   stream = php_stream_fopen_rel(trypath, mode, 
opened_path, options);
-   } else {
-   stream = NULL;
-   }
-   goto stream_done;
+   /* file exists ... check permission */
+   if ((php_check_safe_mode_include_dir(trypath TSRMLS_CC) == 0) 
||
+   php_checkuid(trypath, mode, 
CHECKUID_CHECK_MODE_PARAM)) {
+   /* UID ok, or trypath is in safe_mode_include_dir */
+   stream = php_stream_fopen_rel(trypath, mode, 
opened_path, options);
+   } else {
+   stream = NULL;
}
+   goto stream_done;
}
stream = php_stream_fopen_rel(trypath, mode, opened_path, options);
if (stream) {



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /main fopen_wrappers.c

2003-02-23 Thread Jani Taskinen

sniper  Sun Feb 23 17:30:02 2003 EDT

  Modified files:  
/php4/main  fopen_wrappers.c 
  Log:
  MFB: Fix for open_basedir error message
  
Index: php4/main/fopen_wrappers.c
diff -u php4/main/fopen_wrappers.c:1.158 php4/main/fopen_wrappers.c:1.159
--- php4/main/fopen_wrappers.c:1.158Wed Feb 19 03:40:18 2003
+++ php4/main/fopen_wrappers.c  Sun Feb 23 17:30:02 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: fopen_wrappers.c,v 1.158 2003/02/19 08:40:18 sniper Exp $ */
+/* $Id: fopen_wrappers.c,v 1.159 2003/02/23 22:30:02 sniper Exp $ */
 
 /* {{{ includes
  */
@@ -191,7 +191,7 @@
ptr = end;
}
php_error_docref(NULL TSRMLS_CC, E_WARNING, 
-   open_basedir restriction in effect. File(%s) is not within 
the allowed path(s): (%s), path, pathbuf);
+   open_basedir restriction in effect. File(%s) is not within 
the allowed path(s): (%s), path, PG(open_basedir));
efree(pathbuf);
errno = EPERM; /* we deny permission to open it */
return -1;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/standard basic_functions.c dns.c dns.h

2003-02-23 Thread Jani Taskinen

sniper  Sun Feb 23 19:09:18 2003 EDT

  Modified files:  
/php4/ext/standard  basic_functions.c dns.c dns.h 
  Log:
  Extra paranoia checks if dn_skipname/dn_expand exist or not
  
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.586 
php4/ext/standard/basic_functions.c:1.587
--- php4/ext/standard/basic_functions.c:1.586   Sat Feb 22 15:35:22 2003
+++ php4/ext/standard/basic_functions.c Sun Feb 23 19:09:18 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.586 2003/02/22 20:35:22 iliaa Exp $ */
+/* $Id: basic_functions.c,v 1.587 2003/02/24 00:09:18 sniper Exp $ */
 
 #include php.h
 #include php_streams.h
@@ -598,8 +598,10 @@
 #if HAVE_RES_SEARCH  !(defined(__BEOS__) || defined(PHP_WIN32) || defined(NETWARE))
PHP_FE(dns_check_record,   
 NULL)
PHP_FALIAS(checkdnsrr,  dns_check_record,  
 NULL)
+# if HAVE_DN_SKIPNAME  HAVE_DN_EXPAND
PHP_FE(dns_get_mx,  
second_and_third_args_force_ref)
PHP_FALIAS(getmxrr, dns_get_mx, 
second_and_third_args_force_ref)
+# endif
 # if HAVE_DNS_FUNCS
PHP_FE(dns_get_record,  third_and_rest_force_ref)
 # endif
Index: php4/ext/standard/dns.c
diff -u php4/ext/standard/dns.c:1.56 php4/ext/standard/dns.c:1.57
--- php4/ext/standard/dns.c:1.56Fri Feb 21 03:45:58 2003
+++ php4/ext/standard/dns.c Sun Feb 23 19:09:18 2003
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: dns.c,v 1.56 2003/02/21 08:45:58 sniper Exp $ */
+/* $Id: dns.c,v 1.57 2003/02/24 00:09:18 sniper Exp $ */
 
 /* {{{ includes */
 #include php.h
@@ -632,6 +632,7 @@
 /* }}} */
 #endif /* HAVE_DNS_FUNCS */
 
+#if HAVE_DN_SKIPNAME  HAVE_DN_EXPAND
 /* {{{ proto bool dns_get_mx(string hostname, array mxhosts [, array weight])
Get MX records corresponding to a given Internet host name */
 PHP_FUNCTION(dns_get_mx)
@@ -712,6 +713,7 @@
RETURN_TRUE;
 }
 /* }}} */
+#endif /* HAVE_DN_SKIPNAME  HAVE_DN_EXPAND */
 
 #endif /* HAVE_RES_SEARCH  !(defined(__BEOS__)||defined(PHP_WIN32) || 
defined(NETWARE)) */
 
Index: php4/ext/standard/dns.h
diff -u php4/ext/standard/dns.h:1.14 php4/ext/standard/dns.h:1.15
--- php4/ext/standard/dns.h:1.14Fri Feb 21 03:45:58 2003
+++ php4/ext/standard/dns.h Sun Feb 23 19:09:18 2003
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: dns.h,v 1.14 2003/02/21 08:45:58 sniper Exp $ */
+/* $Id: dns.h,v 1.15 2003/02/24 00:09:18 sniper Exp $ */
 
 #ifndef DNS_H
 #define DNS_H
@@ -34,7 +34,9 @@
 #if HAVE_RES_SEARCH  !(defined(__BEOS__)||defined(PHP_WIN32))
 
 PHP_FUNCTION(dns_check_record);
+# if HAVE_DN_SKIPNAME  HAVE_DN_EXPAND
 PHP_FUNCTION(dns_get_mx);
+# endif
 
 # if HAVE_DNS_FUNCS
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /sapi/apache mod_php4.c

2003-02-23 Thread George Schlossnagle

gschlossnagle   Sun Feb 23 20:19:08 2003 EDT

  Modified files:  
/php4/sapi/apache   mod_php4.c 
  Log:
  hopefully a fix for 19919
  
  
Index: php4/sapi/apache/mod_php4.c
diff -u php4/sapi/apache/mod_php4.c:1.156 php4/sapi/apache/mod_php4.c:1.157
--- php4/sapi/apache/mod_php4.c:1.156   Mon Feb 10 21:23:29 2003
+++ php4/sapi/apache/mod_php4.c Sun Feb 23 20:19:08 2003
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski [EMAIL PROTECTED]  |
+--+
  */
-/* $Id: mod_php4.c,v 1.156 2003/02/11 02:23:29 sas Exp $ */
+/* $Id: mod_php4.c,v 1.157 2003/02/24 01:19:08 gschlossnagle Exp $ */
 
 #include php_apache_http.h
 #include http_conf_globals.h
@@ -169,7 +169,11 @@
 {
char *header_name, *header_content, *p;
request_rec *r = (request_rec *) SG(server_context);
-
+   if(!r) {
+   efree(sapi_header-header);
+   return 0;
+   }
+  
header_name = sapi_header-header;
 
header_content = p = strchr(header_name, ':');
@@ -293,11 +297,15 @@
TSRMLS_FETCH();
 
php_output_set_status(0 TSRMLS_CC);
-   SG(server_context) = NULL; /* The server context (request) is invalid by the 
time run_cleanups() is called */
if (AP(in_request)) {
AP(in_request) = 0;
php_request_shutdown(dummy);
}
+   SG(server_context) = NULL; 
+/* 
+ * The server context (request) is NOT invalid by the time 
+ * run_cleanups() is called 
+ */
 }
 /* }}} */
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /sapi/apache mod_php4.c

2003-02-23 Thread George Schlossnagle

gschlossnagle   Sun Feb 23 20:25:30 2003 EDT

  Modified files:  
/php4/sapi/apache   mod_php4.c 
  Log:
  ws fix
  
  
Index: php4/sapi/apache/mod_php4.c
diff -u php4/sapi/apache/mod_php4.c:1.157 php4/sapi/apache/mod_php4.c:1.158
--- php4/sapi/apache/mod_php4.c:1.157   Sun Feb 23 20:19:08 2003
+++ php4/sapi/apache/mod_php4.c Sun Feb 23 20:25:30 2003
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski [EMAIL PROTECTED]  |
+--+
  */
-/* $Id: mod_php4.c,v 1.157 2003/02/24 01:19:08 gschlossnagle Exp $ */
+/* $Id: mod_php4.c,v 1.158 2003/02/24 01:25:30 gschlossnagle Exp $ */
 
 #include php_apache_http.h
 #include http_conf_globals.h
@@ -302,10 +302,10 @@
php_request_shutdown(dummy);
}
SG(server_context) = NULL; 
-/* 
- * The server context (request) is NOT invalid by the time 
- * run_cleanups() is called 
- */
+   /* 
+   * The server context (request) is NOT invalid by the time 
+   * run_cleanups() is called 
+   */
 }
 /* }}} */
 



-- 
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/apache mod_php4.c

2003-02-23 Thread George Schlossnagle

gschlossnagle   Sun Feb 23 20:29:54 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/sapi/apache   mod_php4.c 
  Log:
  MFH fix for 19919
  
  
Index: php4/sapi/apache/mod_php4.c
diff -u php4/sapi/apache/mod_php4.c:1.146.2.5 php4/sapi/apache/mod_php4.c:1.146.2.6
--- php4/sapi/apache/mod_php4.c:1.146.2.5   Mon Feb 10 21:25:48 2003
+++ php4/sapi/apache/mod_php4.c Sun Feb 23 20:29:54 2003
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski [EMAIL PROTECTED]  |
+--+
  */
-/* $Id: mod_php4.c,v 1.146.2.5 2003/02/11 02:25:48 sas Exp $ */
+/* $Id: mod_php4.c,v 1.146.2.6 2003/02/24 01:29:54 gschlossnagle Exp $ */
 
 #include php_apache_http.h
 #include http_conf_globals.h
@@ -170,6 +170,10 @@
char *header_name, *header_content, *p;
request_rec *r = (request_rec *) SG(server_context);
 
+   if(!r) {
+   efree(sapi_header-header);
+   return 0;
+   }
header_name = sapi_header-header;
 
header_content = p = strchr(header_name, ':');
@@ -293,11 +297,14 @@
TSRMLS_FETCH();
 
php_output_set_status(0 TSRMLS_CC);
-   SG(server_context) = NULL; /* The server context (request) is invalid by the 
time run_cleanups() is called */
if (AP(in_request)) {
AP(in_request) = 0;
php_request_shutdown(dummy);
}
+   SG(server_context) = NULL; 
+   /* The server context (request) is NOT invalid by the time 
+* run_cleanups() is called 
+*/
 }
 /* }}} */
 



-- 
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

2003-02-23 Thread Jani Taskinen

sniper  Sun Feb 23 20:31:25 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4   NEWS 
  Log:
  BFN
  
Index: php4/NEWS
diff -u php4/NEWS:1.1247.2.106 php4/NEWS:1.1247.2.107
--- php4/NEWS:1.1247.2.106  Sun Feb 23 02:35:57 2003
+++ php4/NEWS   Sun Feb 23 20:31:24 2003
@@ -106,6 +106,8 @@
 - Fixed bug #20802 (PHP would die silently when memory limit reached). (Ilia)
 - Fixed bug #20503 (imagesetbrush() not available on Windows). (Edin)
 - Fixed bug #20282 (COM memory leak). (Harald)
+- Fixed bug #19919 (crash in sapi_apache_header_handler under heavy load).
+  (George)
 - Fixed bug #17868 (multiple !--include-- used to include PHP files crashes).
   (Ilia)
 - Fixed bug #17448 (Print the message when OCI_SUCCESS_WITH_INFO is returned).



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/standard file.c /ext/standard/tests/file bug22382.phpt test2.csv

2003-02-23 Thread Ilia Alshanetsky

iliaa   Sun Feb 23 22:13:25 2003 EDT

  Added files: 
/php4/ext/standard/tests/file   bug22382.phpt test2.csv 

  Modified files:  
/php4/ext/standard  file.c 
  Log:
  Fixed bug #22382 (fgetcsv did not handle \ correctly).
  
  
Index: php4/ext/standard/file.c
diff -u php4/ext/standard/file.c:1.309 php4/ext/standard/file.c:1.310
--- php4/ext/standard/file.c:1.309  Sat Feb 22 15:35:22 2003
+++ php4/ext/standard/file.cSun Feb 23 22:13:25 2003
@@ -21,7 +21,7 @@
+--+
  */
 
-/* $Id: file.c,v 1.309 2003/02/22 20:35:22 iliaa Exp $ */
+/* $Id: file.c,v 1.310 2003/02/24 03:13:25 iliaa Exp $ */
 
 /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
 
@@ -2558,6 +2558,21 @@
 
/* 2A. handle enclosure delimited field */
while (*bptr) {
+   /* we need to determine if the enclosure is 'real' or 
is it escaped */
+   if (*(bptr - 1) == '\\') {
+   int escape_cnt = 0;
+   char *bptr_p = bptr - 2;
+   
+   while (bptr_p  buf  *bptr_p == '\\') {
+   escape_cnt++;
+   bptr_p--;
+   }
+   if (!(escape_cnt % 2)) {
+   goto normal_char;
+   continue;
+   }
+   }
+   
if (*bptr == enclosure) {
/* handle the enclosure */
if ( *(bptr+1) == enclosure) {
@@ -2571,6 +2586,7 @@
break;  /* .. from handling this field 
- resumes at 3. */
}
} else {
+normal_char:
/* normal character */
*tptr++ = *bptr++;
 

Index: php4/ext/standard/tests/file/bug22382.phpt
+++ php4/ext/standard/tests/file/bug22382.phpt
--TEST--
Bug #22382: fgetcvs does not handle escaped quotes correctly
--POST--
--GET--
--FILE--
?php
$fp = fopen(dirname(__FILE__)./test2.csv, r);
while(($line = fgetcsv($fp, 1024))) {
var_dump($line);
}
fclose($fp);
?
--EXPECT--
array(6) {
  [0]=
  string(3) One
  [1]=
  string(7) \Two\
  [2]=
  string(7) Three\
  [3]=
  string(4) Four
  [4]=
  string(2) \\
  [5]=
  string(28) \\\
}
Index: php4/ext/standard/tests/file/test2.csv
+++ php4/ext/standard/tests/file/test2.csv
One,\Two\,Three\,Four,\\,\\\



-- 
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 file.c /ext/standard/tests/file bug22382.phpt test2.csv

2003-02-23 Thread Ilia Alshanetsky

iliaa   Sun Feb 23 22:15:54 2003 EDT

  Added files: (Branch: PHP_4_3)
/php4/ext/standard/tests/file   bug22382.phpt test2.csv 

  Modified files:  
/php4/ext/standard  file.c 
  Log:
  MFH
  
  
Index: php4/ext/standard/file.c
diff -u php4/ext/standard/file.c:1.279.2.10 php4/ext/standard/file.c:1.279.2.11
--- php4/ext/standard/file.c:1.279.2.10 Fri Feb 21 21:43:58 2003
+++ php4/ext/standard/file.cSun Feb 23 22:15:53 2003
@@ -21,7 +21,7 @@
+--+
  */
 
-/* $Id: file.c,v 1.279.2.10 2003/02/22 02:43:58 wez Exp $ */
+/* $Id: file.c,v 1.279.2.11 2003/02/24 03:15:53 iliaa Exp $ */
 
 /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
 
@@ -2210,6 +2210,21 @@
 
/* 2A. handle enclosure delimited field */
while (*bptr) {
+   /* we need to determine if the enclosure is 'real' or 
is it escaped */
+   if (*(bptr - 1) == '\\') {
+   int escape_cnt = 0;
+   char *bptr_p = bptr - 2;
+   
+   while (bptr_p  buf  *bptr_p == '\\') {
+   escape_cnt++;
+   bptr_p--;
+   }
+   if (!(escape_cnt % 2)) {
+   goto normal_char;
+   continue;
+   }
+   }
+   
if (*bptr == enclosure) {
/* handle the enclosure */
if ( *(bptr+1) == enclosure) {
@@ -2223,6 +2238,7 @@
break;  /* .. from handling this field 
- resumes at 3. */
}
} else {
+normal_char:
/* normal character */
*tptr++ = *bptr++;
 

Index: php4/ext/standard/tests/file/bug22382.phpt
+++ php4/ext/standard/tests/file/bug22382.phpt
--TEST--
Bug #22382: fgetcvs does not handle escaped quotes correctly
--POST--
--GET--
--FILE--
?php
$fp = fopen(dirname(__FILE__)./test2.csv, r);
while(($line = fgetcsv($fp, 1024))) {
var_dump($line);
}
fclose($fp);
?
--EXPECT--
array(6) {
  [0]=
  string(3) One
  [1]=
  string(7) \Two\
  [2]=
  string(7) Three\
  [3]=
  string(4) Four
  [4]=
  string(2) \\
  [5]=
  string(28) \\\
}
Index: php4/ext/standard/tests/file/test2.csv
+++ php4/ext/standard/tests/file/test2.csv
One,\Two\,Three\,Four,\\,\\\



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 / acinclude.m4

2003-02-23 Thread Jani Taskinen

sniper  Sun Feb 23 23:37:04 2003 EDT

  Modified files:  
/php4   acinclude.m4 
  Log:
  Always use the libtool which is build in the top_builddir.
  
Index: php4/acinclude.m4
diff -u php4/acinclude.m4:1.226 php4/acinclude.m4:1.227
--- php4/acinclude.m4:1.226 Mon Feb 10 12:09:47 2003
+++ php4/acinclude.m4   Sun Feb 23 23:37:04 2003
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.226 2003/02/10 17:09:47 sniper Exp $
+dnl $Id: acinclude.m4,v 1.227 2003/02/24 04:37:04 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -1100,7 +1100,11 @@
 dnl Set libtool variable
 dnl
 AC_DEFUN([PHP_SET_LIBTOOL_VARIABLE],[
-  LIBTOOL='$(SHELL) libtool $1'
+  if test -z $LIBTOOL; then
+LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'
+  else
+LIBTOOL=$LIBTOOL $1
+  fi
 ])
 
 dnl



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4(PHP_4_3) / acinclude.m4

2003-02-23 Thread Jani Taskinen

sniper  Sun Feb 23 23:37:15 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4   acinclude.m4 
  Log:
  MFH
  
Index: php4/acinclude.m4
diff -u php4/acinclude.m4:1.218.2.6 php4/acinclude.m4:1.218.2.7
--- php4/acinclude.m4:1.218.2.6 Mon Feb 10 12:12:16 2003
+++ php4/acinclude.m4   Sun Feb 23 23:37:15 2003
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.218.2.6 2003/02/10 17:12:16 sniper Exp $
+dnl $Id: acinclude.m4,v 1.218.2.7 2003/02/24 04:37:15 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -1107,7 +1107,11 @@
 dnl Set libtool variable
 dnl
 AC_DEFUN([PHP_SET_LIBTOOL_VARIABLE],[
-  LIBTOOL='$(SHELL) libtool $1'
+  if test -z $LIBTOOL; then
+LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'
+  else
+LIBTOOL=$LIBTOOL $1
+  fi
 ])
 
 dnl



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/informix ifx.ec

2003-02-23 Thread Corne' Cornelius

nobbie  Mon Feb 24 01:34:37 2003 EDT

  Modified files:  
/php4/ext/informix  ifx.ec 
  Log:
  (PHP ifx_errormsg) Fixed Informix bug where ifx_errormsg() would Segfault 
 on an unopened connecection and with an errorcode supplied
  
  
Index: php4/ext/informix/ifx.ec
diff -u php4/ext/informix/ifx.ec:1.81 php4/ext/informix/ifx.ec:1.82
--- php4/ext/informix/ifx.ec:1.81   Fri Feb 21 01:50:24 2003
+++ php4/ext/informix/ifx.ecMon Feb 24 01:34:36 2003
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: ifx.ec,v 1.81 2003/02/21 06:50:24 sniper Exp $ */
+/* $Id: ifx.ec,v 1.82 2003/02/24 06:34:36 nobbie Exp $ */
 
 /* ---
  * if you want a function reference : grep '^\*\*' ifx.ec will give
@@ -1650,6 +1650,7 @@
}
 
maxmsglen = 255;
+   msglen = maxmsglen; // Some bug fix, rgetlmsg doesnt always set the value
ifx_errmsg = (char *)malloc(maxmsglen + 1);
if (ifx_errorcode != 0) {
rgetlmsg(ifx_errorcode, ifx_errmsg, maxmsglen, msglen);



-- 
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

2003-02-23 Thread Derick Rethans

On Mon, 24 Feb 2003, Corne' Cornelius wrote:

 nobbieMon Feb 24 01:34:37 2003 EDT
 
   Modified files:  
 /php4/ext/informixifx.ec 
   Log:
   (PHP ifx_errormsg) Fixed Informix bug where ifx_errormsg() would Segfault 
  on an unopened connecection and with an errorcode supplied

The style we normally use for Log messages is this:

- Fixed Informix bug where ifx_errormsg() would Segfault on an unopened
  connecection and with an errorcode supplied.

(although your style is mentioned in the CVS guidelines).

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(PHP_4_3) /ext/informix ifx.ec

2003-02-23 Thread Corne' Cornelius

nobbie  Mon Feb 24 02:45:59 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/informix  ifx.ec 
  Log:
  - MFH: Fixed ifx_errormsg() Segfault 
  
  
Index: php4/ext/informix/ifx.ec
diff -u php4/ext/informix/ifx.ec:1.69.2.8 php4/ext/informix/ifx.ec:1.69.2.9
--- php4/ext/informix/ifx.ec:1.69.2.8   Fri Feb 21 01:49:55 2003
+++ php4/ext/informix/ifx.ecMon Feb 24 02:45:58 2003
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: ifx.ec,v 1.69.2.8 2003/02/21 06:49:55 sniper Exp $ */
+/* $Id: ifx.ec,v 1.69.2.9 2003/02/24 07:45:58 nobbie Exp $ */
 
 /* ---
  * if you want a function reference : grep '^\*\*' ifx.ec will give
@@ -1650,6 +1650,7 @@
}
 
maxmsglen = 255;
+   msglen = maxmsglen; // Some bug fix, rgetlmsg doesnt always set the value
ifx_errmsg = (char *)malloc(maxmsglen + 1);
if (ifx_errorcode != 0) {
rgetlmsg(ifx_errorcode, ifx_errmsg, maxmsglen, msglen);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS-DAILY] cvs: php4 / ChangeLog

[PHP-CVS] cvs: php4 /ext/imap config.m4

[PHP-CVS] cvs: php4(PHP_4_3) /ext/imap config.m4

[PHP-CVS] cvs: php4(PHP_4_3) /sapi/cgi config9.m4

[PHP-CVS] cvs: php4 /sapi/cgi config9.m4

[PHP-CVS] cvs: php4 /sapi/apache libpre.c php_apache_http.h

[PHP-CVS] cvs: php4(PHP_4_3) /main fopen_wrappers.c streams.c

[PHP-CVS] cvs: php4 /main fopen_wrappers.c

[PHP-CVS] cvs: php4 /ext/standard basic_functions.c dns.c dns.h

[PHP-CVS] cvs: php4 /sapi/apache mod_php4.c

[PHP-CVS] cvs: php4 /sapi/apache mod_php4.c

[PHP-CVS] cvs: php4(PHP_4_3) /sapi/apache mod_php4.c

[PHP-CVS] cvs: php4(PHP_4_3) / NEWS

[PHP-CVS] cvs: php4 /ext/standard file.c /ext/standard/tests/file bug22382.phpt test2.csv

[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard file.c /ext/standard/tests/file bug22382.phpt test2.csv

[PHP-CVS] cvs: php4 / acinclude.m4

[PHP-CVS] cvs: php4(PHP_4_3) / acinclude.m4

[PHP-CVS] cvs: php4 /ext/informix ifx.ec

Re: [PHP-CVS] cvs: php4 /ext/informix ifx.ec

[PHP-CVS] cvs: php4(PHP_4_3) /ext/informix ifx.ec

20 matches

Site Navigation

Mail list logo

Footer information