[PHP-CVS] cvs: php4 /ext/standard dir.c

2001-04-09 Thread Sean Bright 

elixer  Mon Apr  9 13:56:49 2001 EDT

  Modified files:  
/php4/ext/standard  dir.c 
  Log:
  Stop SIGSEGV on Apache startup.  Patch from [EMAIL PROTECTED]
  
  
Index: php4/ext/standard/dir.c
diff -u php4/ext/standard/dir.c:1.59 php4/ext/standard/dir.c:1.60
--- php4/ext/standard/dir.c:1.59Sun Apr  8 14:57:13 2001
+++ php4/ext/standard/dir.c Mon Apr  9 13:56:49 2001
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: dir.c,v 1.59 2001/04/08 21:57:13 ssb Exp $ */
+/* $Id: dir.c,v 1.60 2001/04/09 20:56:49 elixer Exp $ */
 
 /* {{{ includes/startup/misc */
 
@@ -141,7 +141,7 @@
 #endif
 tmpstr[0] = DEFAULT_SLASH;
 tmpstr[1] = '\0';
-REGISTER_STRING_CONSTANT("DIRECTORY_SEPARATOR", tmpstr, 0);
+REGISTER_STRING_CONSTANT("DIRECTORY_SEPARATOR", tmpstr, CONST_PERSISTENT);
 
return SUCCESS;
 }



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

Re: [PHP-CVS] cvs: php4 /ext/standard dir.c

2001-04-09 Thread Sterling Hughes 

On Mon, 9 Apr 2001, Sean Bright wrote:

 elixerMon Apr  9 13:56:49 2001 EDT

   Modified files:
 /php4/ext/standarddir.c
   Log:
   Stop SIGSEGV on Apache startup.  Patch from [EMAIL PROTECTED]


Should be CONST_CS|CONST_PERSISTENT no?


 Index: php4/ext/standard/dir.c
 diff -u php4/ext/standard/dir.c:1.59 php4/ext/standard/dir.c:1.60
 --- php4/ext/standard/dir.c:1.59  Sun Apr  8 14:57:13 2001
 +++ php4/ext/standard/dir.c   Mon Apr  9 13:56:49 2001
 @@ -17,7 +17,7 @@
 +--+
   */

 -/* $Id: dir.c,v 1.59 2001/04/08 21:57:13 ssb Exp $ */
 +/* $Id: dir.c,v 1.60 2001/04/09 20:56:49 elixer Exp $ */

  /* {{{ includes/startup/misc */

 @@ -141,7 +141,7 @@
  #endif
  tmpstr[0] = DEFAULT_SLASH;
  tmpstr[1] = '\0';
 -REGISTER_STRING_CONSTANT("DIRECTORY_SEPARATOR", tmpstr, 0);
 +REGISTER_STRING_CONSTANT("DIRECTORY_SEPARATOR", tmpstr, CONST_PERSISTENT);

   return SUCCESS;
  }





-- 
Alavilla mailla hallanvaara


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 /ext/standard dir.c

2001-04-09 Thread Jon Parise 

jon Mon Apr  9 14:08:47 2001 EDT

  Modified files:  
/php4/ext/standard  dir.c 
  Log:
  Fix whitespace (use tabs).
  
  
Index: php4/ext/standard/dir.c
diff -u php4/ext/standard/dir.c:1.60 php4/ext/standard/dir.c:1.61
--- php4/ext/standard/dir.c:1.60Mon Apr  9 13:56:49 2001
+++ php4/ext/standard/dir.c Mon Apr  9 14:08:47 2001
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: dir.c,v 1.60 2001/04/09 20:56:49 elixer Exp $ */
+/* $Id: dir.c,v 1.61 2001/04/09 21:08:47 jon Exp $ */
 
 /* {{{ includes/startup/misc */
 
@@ -128,7 +128,7 @@
 
 PHP_MINIT_FUNCTION(dir)
 {
-static char tmpstr[2];
+   static char tmpstr[2];
zend_class_entry dir_class_entry;
 
le_dirp = zend_register_list_destructors_ex(_dir_dtor, NULL, "dir", 
module_number);
@@ -139,9 +139,9 @@
 #ifdef ZTS
dir_globals_id = ts_allocate_id(sizeof(php_dir_globals), NULL, NULL);
 #endif
-tmpstr[0] = DEFAULT_SLASH;
-tmpstr[1] = '\0';
-REGISTER_STRING_CONSTANT("DIRECTORY_SEPARATOR", tmpstr, CONST_PERSISTENT);
+   tmpstr[0] = DEFAULT_SLASH;
+   tmpstr[1] = '\0';
+   REGISTER_STRING_CONSTANT("DIRECTORY_SEPARATOR", tmpstr, CONST_PERSISTENT);
 
return SUCCESS;
 }



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 /ext/standard dir.c

2001-04-09 Thread Sean Bright 

elixer  Mon Apr  9 14:12:54 2001 EDT

  Modified files:  
/php4/ext/standard  dir.c 
  Log:
  Constand should be case sensitive.
  # Thanks Sterling
  
  
Index: php4/ext/standard/dir.c
diff -u php4/ext/standard/dir.c:1.61 php4/ext/standard/dir.c:1.62
--- php4/ext/standard/dir.c:1.61Mon Apr  9 14:08:47 2001
+++ php4/ext/standard/dir.c Mon Apr  9 14:12:54 2001
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: dir.c,v 1.61 2001/04/09 21:08:47 jon Exp $ */
+/* $Id: dir.c,v 1.62 2001/04/09 21:12:54 elixer Exp $ */
 
 /* {{{ includes/startup/misc */
 
@@ -141,7 +141,7 @@
 #endif
tmpstr[0] = DEFAULT_SLASH;
tmpstr[1] = '\0';
-   REGISTER_STRING_CONSTANT("DIRECTORY_SEPARATOR", tmpstr, CONST_PERSISTENT);
+   REGISTER_STRING_CONSTANT("DIRECTORY_SEPARATOR", tmpstr, 
+CONST_CS|CONST_PERSISTENT);
 
return SUCCESS;
 }



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 /ext/standard dir.c

2001-04-08 Thread Stig Bakken 

ssb Sun Apr  8 14:57:14 2001 EDT

  Modified files:  
/php4/ext/standard  dir.c 
  Log:
  @Add DIRECTORY_SEPARATOR constant ('/' on UNIX, '\' on Windows) (Stig)
  
  
Index: php4/ext/standard/dir.c
diff -u php4/ext/standard/dir.c:1.58 php4/ext/standard/dir.c:1.59
--- php4/ext/standard/dir.c:1.58Sun Feb 25 22:07:17 2001
+++ php4/ext/standard/dir.c Sun Apr  8 14:57:13 2001
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: dir.c,v 1.58 2001/02/26 06:07:17 andi Exp $ */
+/* $Id: dir.c,v 1.59 2001/04/08 21:57:13 ssb Exp $ */
 
 /* {{{ includes/startup/misc */
 
@@ -128,6 +128,7 @@
 
 PHP_MINIT_FUNCTION(dir)
 {
+static char tmpstr[2];
zend_class_entry dir_class_entry;
 
le_dirp = zend_register_list_destructors_ex(_dir_dtor, NULL, "dir", 
module_number);
@@ -138,6 +139,9 @@
 #ifdef ZTS
dir_globals_id = ts_allocate_id(sizeof(php_dir_globals), NULL, NULL);
 #endif
+tmpstr[0] = DEFAULT_SLASH;
+tmpstr[1] = '\0';
+REGISTER_STRING_CONSTANT("DIRECTORY_SEPARATOR", tmpstr, 0);
 
return SUCCESS;
 }



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]