Re: [PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/fileinfo fileinfo.c

2008-09-20 Thread Marcus Boerger
Hello Scott,

Tuesday, September 16, 2008, 12:13:25 AM, you wrote:

 scottmacMon Sep 15 22:13:25 2008 UTC

   Modified files:  (Branch: PHP_5_3)
 /php-srcNEWS 
 /php-src/ext/fileinfo   fileinfo.c 
   Log:
   Fixed bug #46086 (Segfault when accessing fileinfo class property)
   
 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.317r2=1.2027.2.547.2.965.2.318diff_format=u
 Index: php-src/NEWS
 diff -u php-src/NEWS:1.2027.2.547.2.965.2.317
 php-src/NEWS:1.2027.2.547.2.965.2.318
 --- php-src/NEWS:1.2027.2.547.2.965.2.317   Sun Sep 14 06:47:08 2008
 +++ php-src/NEWSMon Sep 15 22:13:25 2008
 @@ -2,9 +2,12 @@
 
 |||
  ?? ??? 200?, PHP 5.3.0 Alpha 3
  - Upgraded bundled PCRE to version 7.8. (Nuno)
 +- Upgraded bundled sqlite to version 3.6.2. (Scott)
  - Changed error level E_ERROR into E_WARNING in Soap extension methods 
parameter validation. (Felipe)
  
 +- Fixed bug #46086 (Segfault when accessing fileinfo class properties).
 +  (Scott)
  - Fixed bug #46072 (Compile failure under IRIX 6.5.30 building util.c) (Greg)
  - Fixed bug #46060 (Phar::addEmptyDir() breaks) (Greg)
  - Fixed bug #46042 (memory leaks with reflection of mb_convert_encoding()).
 http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/fileinfo.c?r1=1.20.2.13r2=1.20.2.14diff_format=u
 Index: php-src/ext/fileinfo/fileinfo.c
 diff -u php-src/ext/fileinfo/fileinfo.c:1.20.2.13
 php-src/ext/fileinfo/fileinfo.c:1.20.2.14
 --- php-src/ext/fileinfo/fileinfo.c:1.20.2.13   Sat Sep 13 21:32:21 2008
 +++ php-src/ext/fileinfo/fileinfo.c Mon Sep 15 22:13:25 2008
 @@ -16,7 +16,7 @@
+--+
  */
  
 -/* $Id: fileinfo.c,v 1.20.2.13 2008/09/13 21:32:21 tony2001 Exp $ */
 +/* $Id: fileinfo.c,v 1.20.2.14 2008/09/15 22:13:25 scottmac Exp $ */
  
  #ifdef HAVE_CONFIG_H
  #include config.h
 @@ -100,15 +100,11 @@
 zend_object_value retval;
 struct finfo_object *intern;
  
 -   intern = ecalloc(1, sizeof(struct finfo_object));
 -   intern-zo.ce = class_type;
 -   intern-zo.properties = NULL;
 -#if ZEND_MODULE_API_NO = 20050922
 -   intern-zo.guards = NULL;
 -#else
 -   intern-zo.in_get = 0;
 -   intern-zo.in_set = 0;
 -#endif
 +   intern = emalloc(sizeof(struct finfo_object));
The ecallow actually seemed to be correct as it made sure that both the
inherited stad zend object struct gets initialized as well as anything
beyon that. Now calling zend_object_std_init() obviously prevents a
maintenance nightmare and in this case fixes an error. Still the rest of
the struct needs to be initialized as well.
 +
 +   zend_object_std_init(intern-zo, class_type TSRMLS_CC);
 +   zend_hash_copy(intern-zo.properties,
 class_type-default_properties, (copy_ctor_func_t) zval_add_ref,(void *) 
 tmp, sizeof(zval *));
 +
 intern-ptr = NULL;
  
 retval.handle = zend_objects_store_put(intern,
 finfo_objects_dtor, NULL, NULL TSRMLS_CC);






Best regards,
 Marcus


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



[PHP-CVS] cvs: php-src /ext/unicode collator.c

2008-09-20 Thread Felipe Pena
felipe  Sat Sep 20 22:06:19 2008 UTC

  Modified files:  
/php-src/ext/unicodecollator.c 
  Log:
  - Fixed bug #46067 (Collator methods - Segfault)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/unicode/collator.c?r1=1.17r2=1.18diff_format=u
Index: php-src/ext/unicode/collator.c
diff -u php-src/ext/unicode/collator.c:1.17 php-src/ext/unicode/collator.c:1.18
--- php-src/ext/unicode/collator.c:1.17 Tue Mar  4 23:39:15 2008
+++ php-src/ext/unicode/collator.c  Sat Sep 20 22:06:18 2008
@@ -14,7 +14,7 @@
+--+
 */
 
-/* $Id: collator.c,v 1.17 2008/03/04 23:39:15 felipe Exp $ */
+/* $Id: collator.c,v 1.18 2008/09/20 22:06:18 felipe Exp $ */
 
 #include php.h
 #include ext/standard/php_array.h
@@ -180,10 +180,14 @@
int   collator_name_len;
zval *object;
UCollator*ucoll;
+   zend_error_handling error_handling;
+
+   zend_replace_error_handling(EH_THROW, NULL, error_handling TSRMLS_CC);
 
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s, 
collator_name, collator_name_len) == FAILURE) {
RETURN_FALSE;
}
+   zend_restore_error_handling(error_handling TSRMLS_CC);
 
if ((object = getThis()) == NULL) {
object = return_value;



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



[PHP-CVS] cvs: php-src /ext/posix config.m4 posix.c

2008-09-20 Thread Arnaud Le Blanc
lbarnaudSat Sep 20 22:12:31 2008 UTC

  Modified files:  
/php-src/ext/posix  config.m4 posix.c 
  Log:
  Fixed #46059 (Compile failure under IRIX 6.5.30 building posix.c)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/posix/config.m4?r1=1.17r2=1.18diff_format=u
Index: php-src/ext/posix/config.m4
diff -u php-src/ext/posix/config.m4:1.17 php-src/ext/posix/config.m4:1.18
--- php-src/ext/posix/config.m4:1.17Thu Mar  1 11:23:07 2007
+++ php-src/ext/posix/config.m4 Sat Sep 20 22:12:31 2008
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.17 2007/03/01 11:23:07 tony2001 Exp $
+dnl $Id: config.m4,v 1.18 2008/09/20 22:12:31 lbarnaud Exp $
 dnl
 
 PHP_ARG_ENABLE(posix,whether to enable POSIX-like functions,
@@ -31,4 +31,20 @@
   ], [
 AC_MSG_RESULT([no, cannot detect working ttyname_r() when cross compiling. 
posix_ttyname() will be thread-unsafe])
   ])
+
+  AC_CACHE_CHECK([for utsname.domainname], ac_cv_have_utsname_domainname, [
+AC_TRY_COMPILE([
+  #define _GNU_SOURCE
+  #include sys/utsname.h
+],[
+  return sizeof(((struct utsname *)0)-domainname);
+],[
+  ac_cv_have_utsname_domainname=yes
+],[
+  ac_cv_have_utsname_domainname=no
+])
+  ])
+  if test ac_cv_have_utsname_domainname=yes; then
+AC_DEFINE(HAVE_UTSNAME_DOMAINNAME, 1, [Wether struct utsname has 
domainname])
+  fi
 fi
http://cvs.php.net/viewvc.cgi/php-src/ext/posix/posix.c?r1=1.102r2=1.103diff_format=u
Index: php-src/ext/posix/posix.c
diff -u php-src/ext/posix/posix.c:1.102 php-src/ext/posix/posix.c:1.103
--- php-src/ext/posix/posix.c:1.102 Mon Jun 23 17:54:14 2008
+++ php-src/ext/posix/posix.c   Sat Sep 20 22:12:31 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: posix.c,v 1.102 2008/06/23 17:54:14 felipe Exp $ */
+/* $Id: posix.c,v 1.103 2008/09/20 22:12:31 lbarnaud Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -345,7 +345,7 @@
 static PHP_MINFO_FUNCTION(posix)
 {
php_info_print_table_start();
-   php_info_print_table_row(2, Revision, $Revision: 1.102 $);
+   php_info_print_table_row(2, Revision, $Revision: 1.103 $);
php_info_print_table_end();
 }
 /* }}} */
@@ -666,7 +666,7 @@
add_assoc_string(return_value, release,  u.release,  1);
add_assoc_string(return_value, version,  u.version,  1);
add_assoc_string(return_value, machine,  u.machine,  1);
-#if defined(_GNU_SOURCE)  !defined(DARWIN)
+#if defined(_GNU_SOURCE)  !defined(DARWIN)  
defined(HAVE_UTSNAME_DOMAINNAME)
add_assoc_string(return_value, domainname, u.domainname, 1);
 #endif
 }



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



[PHP-CVS] cvs: php-src(PHP_5_3) /ext/posix config.m4 posix.c

2008-09-20 Thread Arnaud Le Blanc
lbarnaudSat Sep 20 22:12:44 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/posix  config.m4 posix.c 
  Log:
  MFH: Fixed #46059 (Compile failure under IRIX 6.5.30 building posix.c)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/posix/config.m4?r1=1.12.4.5r2=1.12.4.5.2.1diff_format=u
Index: php-src/ext/posix/config.m4
diff -u php-src/ext/posix/config.m4:1.12.4.5 
php-src/ext/posix/config.m4:1.12.4.5.2.1
--- php-src/ext/posix/config.m4:1.12.4.5Thu Mar  1 11:23:54 2007
+++ php-src/ext/posix/config.m4 Sat Sep 20 22:12:43 2008
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.12.4.5 2007/03/01 11:23:54 tony2001 Exp $
+dnl $Id: config.m4,v 1.12.4.5.2.1 2008/09/20 22:12:43 lbarnaud Exp $
 dnl
 
 PHP_ARG_ENABLE(posix,whether to enable POSIX-like functions,
@@ -31,4 +31,20 @@
   ], [
 AC_MSG_RESULT([no, cannot detect working ttyname_r() when cross compiling. 
posix_ttyname() will be thread-unsafe])
   ])
+
+  AC_CACHE_CHECK([for utsname.domainname], ac_cv_have_utsname_domainname, [
+AC_TRY_COMPILE([
+  #define _GNU_SOURCE
+  #include sys/utsname.h
+],[
+  return sizeof(((struct utsname *)0)-domainname);
+],[
+  ac_cv_have_utsname_domainname=yes
+],[
+  ac_cv_have_utsname_domainname=no
+])
+  ])
+  if test ac_cv_have_utsname_domainname=yes; then
+AC_DEFINE(HAVE_UTSNAME_DOMAINNAME, 1, [Wether struct utsname has 
domainname])
+  fi
 fi
http://cvs.php.net/viewvc.cgi/php-src/ext/posix/posix.c?r1=1.70.2.3.2.16.2.9r2=1.70.2.3.2.16.2.10diff_format=u
Index: php-src/ext/posix/posix.c
diff -u php-src/ext/posix/posix.c:1.70.2.3.2.16.2.9 
php-src/ext/posix/posix.c:1.70.2.3.2.16.2.10
--- php-src/ext/posix/posix.c:1.70.2.3.2.16.2.9 Mon Jun 23 17:28:06 2008
+++ php-src/ext/posix/posix.c   Sat Sep 20 22:12:43 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: posix.c,v 1.70.2.3.2.16.2.9 2008/06/23 17:28:06 felipe Exp $ */
+/* $Id: posix.c,v 1.70.2.3.2.16.2.10 2008/09/20 22:12:43 lbarnaud Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -345,7 +345,7 @@
 static PHP_MINFO_FUNCTION(posix)
 {
php_info_print_table_start();
-   php_info_print_table_row(2, Revision, $Revision: 1.70.2.3.2.16.2.9 
$);
+   php_info_print_table_row(2, Revision, $Revision: 1.70.2.3.2.16.2.10 
$);
php_info_print_table_end();
 }
 /* }}} */
@@ -667,7 +667,7 @@
add_assoc_string(return_value, version,  u.version,  1);
add_assoc_string(return_value, machine,  u.machine,  1);
 
-#if defined(_GNU_SOURCE)  !defined(DARWIN)
+#if defined(_GNU_SOURCE)  !defined(DARWIN)  
defined(HAVE_UTSNAME_DOMAINNAME)
add_assoc_string(return_value, domainname, u.domainname, 1);
 #endif
 }



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



[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/posix config.m4 posix.c

2008-09-20 Thread Arnaud Le Blanc
lbarnaudSat Sep 20 22:13:00 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
/php-src/ext/posix  config.m4 posix.c 
  Log:
  MFH: Fixed #46059 (Compile failure under IRIX 6.5.30 building posix.c)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1228r2=1.2027.2.547.2.1229diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1228 php-src/NEWS:1.2027.2.547.2.1229
--- php-src/NEWS:1.2027.2.547.2.1228Tue Sep 16 23:37:35 2008
+++ php-src/NEWSSat Sep 20 22:12:59 2008
@@ -18,7 +18,9 @@
   (Scott)
 - Fixed a crash on invalid method in ReflectionParameter constructor.
   (Christian Seiler)
-- Fixed buf #46053 (SplFileObject::seek - Endless loop). (Arnaud)
+- Fixed bug #46059 (Compile failure under IRIX 6.5.30 building posix.c). 
+  (Arnaud)
+- Fixed bug #46053 (SplFileObject::seek - Endless loop). (Arnaud)
 - Fixed bug #46051 (SplFileInfo::openFile - memory overlap). (Arnaud)
 - Fixed bug #46047 (SimpleXML converts empty nodes into object with nested 
   array). (Rob)
http://cvs.php.net/viewvc.cgi/php-src/ext/posix/config.m4?r1=1.12.4.5r2=1.12.4.6diff_format=u
Index: php-src/ext/posix/config.m4
diff -u php-src/ext/posix/config.m4:1.12.4.5 
php-src/ext/posix/config.m4:1.12.4.6
--- php-src/ext/posix/config.m4:1.12.4.5Thu Mar  1 11:23:54 2007
+++ php-src/ext/posix/config.m4 Sat Sep 20 22:12:59 2008
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.12.4.5 2007/03/01 11:23:54 tony2001 Exp $
+dnl $Id: config.m4,v 1.12.4.6 2008/09/20 22:12:59 lbarnaud Exp $
 dnl
 
 PHP_ARG_ENABLE(posix,whether to enable POSIX-like functions,
@@ -31,4 +31,20 @@
   ], [
 AC_MSG_RESULT([no, cannot detect working ttyname_r() when cross compiling. 
posix_ttyname() will be thread-unsafe])
   ])
+
+  AC_CACHE_CHECK([for utsname.domainname], ac_cv_have_utsname_domainname, [
+AC_TRY_COMPILE([
+  #define _GNU_SOURCE
+  #include sys/utsname.h
+],[
+  return sizeof(((struct utsname *)0)-domainname);
+],[
+  ac_cv_have_utsname_domainname=yes
+],[
+  ac_cv_have_utsname_domainname=no
+])
+  ])
+  if test ac_cv_have_utsname_domainname=yes; then
+AC_DEFINE(HAVE_UTSNAME_DOMAINNAME, 1, [Wether struct utsname has 
domainname])
+  fi
 fi
http://cvs.php.net/viewvc.cgi/php-src/ext/posix/posix.c?r1=1.70.2.3.2.19r2=1.70.2.3.2.20diff_format=u
Index: php-src/ext/posix/posix.c
diff -u php-src/ext/posix/posix.c:1.70.2.3.2.19 
php-src/ext/posix/posix.c:1.70.2.3.2.20
--- php-src/ext/posix/posix.c:1.70.2.3.2.19 Wed Aug 20 20:04:52 2008
+++ php-src/ext/posix/posix.c   Sat Sep 20 22:12:59 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: posix.c,v 1.70.2.3.2.19 2008/08/20 20:04:52 rasmus Exp $ */
+/* $Id: posix.c,v 1.70.2.3.2.20 2008/09/20 22:12:59 lbarnaud Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -147,7 +147,7 @@
 static PHP_MINFO_FUNCTION(posix)
 {
php_info_print_table_start();
-   php_info_print_table_row(2, Revision, $Revision: 1.70.2.3.2.19 $);
+   php_info_print_table_row(2, Revision, $Revision: 1.70.2.3.2.20 $);
php_info_print_table_end();
 }
 /* }}} */
@@ -467,7 +467,7 @@
add_assoc_string(return_value, release,  u.release,  1);
add_assoc_string(return_value, version,  u.version,  1);
add_assoc_string(return_value, machine,  u.machine,  1);
-#if defined(_GNU_SOURCE)  !defined(DARWIN)
+#if defined(_GNU_SOURCE)  !defined(DARWIN)  
defined(HAVE_UTSNAME_DOMAINNAME)
add_assoc_string(return_value, domainname, u.domainname, 1);
 #endif
 }



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



[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sqlite3/libsqlite sqlite3.h

2008-09-20 Thread Pierre-Alain Joye
pajoye  Sat Sep 20 23:10:17 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/sqlite3/libsqlite  sqlite3.h 
  Log:
  - fix VC6 build
  
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/libsqlite/sqlite3.h?r1=1.1.2.4r2=1.1.2.5diff_format=u
Index: php-src/ext/sqlite3/libsqlite/sqlite3.h
diff -u php-src/ext/sqlite3/libsqlite/sqlite3.h:1.1.2.4 
php-src/ext/sqlite3/libsqlite/sqlite3.h:1.1.2.5
--- php-src/ext/sqlite3/libsqlite/sqlite3.h:1.1.2.4 Mon Sep 15 01:22:06 2008
+++ php-src/ext/sqlite3/libsqlite/sqlite3.h Sat Sep 20 23:10:16 2008
@@ -30,7 +30,7 @@
 ** the version number) and changes its name to sqlite3.h as
 ** part of the build process.
 **
-** @(#) $Id: sqlite3.h,v 1.1.2.4 2008/09/15 01:22:06 scottmac Exp $
+** @(#) $Id: sqlite3.h,v 1.1.2.5 2008/09/20 23:10:16 pajoye Exp $
 */
 #ifndef _SQLITE3_H_
 #define _SQLITE3_H_
@@ -54,15 +54,15 @@
 /*
 ** Add the ability to mark interfaces as deprecated.
 */
-#if (__GNUC__  3 || (__GNUC__ == 3  __GNUC_MINOR__ = 1))
-  /* GCC added the deprecated attribute in version 3.1 */
-  #define SQLITE_DEPRECATED __attribute__ ((deprecated))
-#elif defined(_MSC_VER)
-  #define SQLITE_DEPRECATED __declspec(deprecated)
+#if ZEND_GCC_VERSION = 3001
+# define SQLITE_DEPRECATED  __attribute__((deprecated))
+#elif defined(ZEND_WIN32)  defined(_MSC_VER)  _MSC_VER = 1300
+# define SQLITE_DEPRECATED  __declspec(deprecated)
 #else
-  #define SQLITE_DEPRECATED
+# define SQLITE_DEPRECATED
 #endif
 
+
 /*
 ** Add the ability to mark interfaces as experimental.
 */
@@ -70,7 +70,7 @@
   /* I can confirm that it does not work on version 4.1.0... */
   /* First appears in GCC docs for version 4.3.0 */
   #define SQLITE_EXPERIMENTAL __attribute__ ((warning (is experimental)))
-#elif defined(_MSC_VER)
+#elif defined(_MSC_VER)  _MSC_VER = 1500
   #define SQLITE_EXPERIMENTAL __declspec(deprecated(was declared 
experimental))
 #else
   #define SQLITE_EXPERIMENTAL



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



[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/litespeed lsapilib.c

2008-09-20 Thread George Wang
gwang   Sun Sep 21 02:34:08 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/sapi/litespeed lsapilib.c 
  Log:
  disable core dump by default
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/litespeed/lsapilib.c?r1=1.5.2.3r2=1.5.2.4diff_format=u
Index: php-src/sapi/litespeed/lsapilib.c
diff -u php-src/sapi/litespeed/lsapilib.c:1.5.2.3 
php-src/sapi/litespeed/lsapilib.c:1.5.2.4
--- php-src/sapi/litespeed/lsapilib.c:1.5.2.3   Tue Aug 26 22:05:17 2008
+++ php-src/sapi/litespeed/lsapilib.c   Sun Sep 21 02:34:08 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: lsapilib.c,v 1.5.2.3 2008/08/26 22:05:17 gwang Exp $ */
+/* $Id: lsapilib.c,v 1.5.2.4 2008/09/21 02:34:08 gwang Exp $ */
 
 /*
 Copyright (c) 2007, Lite Speed Technologies Inc.
@@ -66,7 +66,9 @@
 #include stdio.h
 #include string.h
 #include sys/mman.h
+#include sys/resource.h
 #include sys/socket.h
+#include sys/time.h
 #include sys/uio.h
 #include sys/wait.h
 #include time.h
@@ -2120,7 +2122,16 @@
 if ( p ) {
 avoidFork = atoi( p );
 }
-
+
+#if defined( RLIMIT_CORE )
+p = getenv( LSAPI_ALLOW_CORE_DUMP );
+if ( !p )
+{
+struct rlimit limit = { 0, 0 };
+setrlimit( RLIMIT_CORE, limit );
+}
+#endif
+
 p = getenv( LSAPI_MAX_IDLE );
 if ( p ) {
 n = atoi( p );



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



[PHP-CVS] cvs: php-src /sapi/litespeed lsapilib.c

2008-09-20 Thread George Wang
gwang   Sun Sep 21 02:34:48 2008 UTC

  Modified files:  
/php-src/sapi/litespeed lsapilib.c 
  Log:
  disable core dump by default
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/litespeed/lsapilib.c?r1=1.6r2=1.7diff_format=u
Index: php-src/sapi/litespeed/lsapilib.c
diff -u php-src/sapi/litespeed/lsapilib.c:1.6 
php-src/sapi/litespeed/lsapilib.c:1.7
--- php-src/sapi/litespeed/lsapilib.c:1.6   Tue Aug 26 21:59:56 2008
+++ php-src/sapi/litespeed/lsapilib.c   Sun Sep 21 02:34:48 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: lsapilib.c,v 1.6 2008/08/26 21:59:56 gwang Exp $ */
+/* $Id: lsapilib.c,v 1.7 2008/09/21 02:34:48 gwang Exp $ */
 
 /*
 Copyright (c) 2007, Lite Speed Technologies Inc.
@@ -66,7 +66,9 @@
 #include stdio.h
 #include string.h
 #include sys/mman.h
+#include sys/resource.h
 #include sys/socket.h
+#include sys/time.h
 #include sys/uio.h
 #include sys/wait.h
 #include time.h
@@ -2120,7 +2122,16 @@
 if ( p ) {
 avoidFork = atoi( p );
 }
-
+
+#if defined( RLIMIT_CORE )
+p = getenv( LSAPI_ALLOW_CORE_DUMP );
+if ( !p )
+{
+struct rlimit limit = { 0, 0 };
+setrlimit( RLIMIT_CORE, limit );
+}
+#endif
+
 p = getenv( LSAPI_MAX_IDLE );
 if ( p ) {
 n = atoi( p );



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



[PHP-CVS] cvs: php-src /sapi/litespeed lsapilib.c

2008-09-20 Thread George Wang
gwang   Sun Sep 21 02:37:57 2008 UTC

  Modified files:  
/php-src/sapi/litespeed lsapilib.c 
  Log:
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/litespeed/lsapilib.c?r1=1.7r2=1.8diff_format=u
Index: php-src/sapi/litespeed/lsapilib.c
diff -u php-src/sapi/litespeed/lsapilib.c:1.7 
php-src/sapi/litespeed/lsapilib.c:1.8
--- php-src/sapi/litespeed/lsapilib.c:1.7   Sun Sep 21 02:34:48 2008
+++ php-src/sapi/litespeed/lsapilib.c   Sun Sep 21 02:37:57 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: lsapilib.c,v 1.7 2008/09/21 02:34:48 gwang Exp $ */
+/* $Id: lsapilib.c,v 1.8 2008/09/21 02:37:57 gwang Exp $ */
 
 /*
 Copyright (c) 2007, Lite Speed Technologies Inc.
@@ -2125,8 +2125,7 @@
 
 #if defined( RLIMIT_CORE )
 p = getenv( LSAPI_ALLOW_CORE_DUMP );
-if ( !p )
-{
+if ( !p ) {
 struct rlimit limit = { 0, 0 };
 setrlimit( RLIMIT_CORE, limit );
 }



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



[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/litespeed lsapilib.c

2008-09-20 Thread George Wang
gwang   Sun Sep 21 02:38:32 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/sapi/litespeed lsapilib.c 
  Log:
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/litespeed/lsapilib.c?r1=1.5.2.4r2=1.5.2.5diff_format=u
Index: php-src/sapi/litespeed/lsapilib.c
diff -u php-src/sapi/litespeed/lsapilib.c:1.5.2.4 
php-src/sapi/litespeed/lsapilib.c:1.5.2.5
--- php-src/sapi/litespeed/lsapilib.c:1.5.2.4   Sun Sep 21 02:34:08 2008
+++ php-src/sapi/litespeed/lsapilib.c   Sun Sep 21 02:38:32 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: lsapilib.c,v 1.5.2.4 2008/09/21 02:34:08 gwang Exp $ */
+/* $Id: lsapilib.c,v 1.5.2.5 2008/09/21 02:38:32 gwang Exp $ */
 
 /*
 Copyright (c) 2007, Lite Speed Technologies Inc.
@@ -2125,8 +2125,7 @@
 
 #if defined( RLIMIT_CORE )
 p = getenv( LSAPI_ALLOW_CORE_DUMP );
-if ( !p )
-{
+if ( !p ) {
 struct rlimit limit = { 0, 0 };
 setrlimit( RLIMIT_CORE, limit );
 }



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