date:20070520

[PHP-CVS-DAILY] cvs: php-src / ChangeLog

2007-05-20 Thread changelog

changelog   Mon May 21 01:31:05 2007 UTC

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2694r2=1.2695diff_format=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.2694 php-src/ChangeLog:1.2695
--- php-src/ChangeLog:1.2694Sun May 20 01:31:03 2007
+++ php-src/ChangeLog   Mon May 21 01:31:05 2007
@@ -1,3 +1,26 @@
+2007-05-20  Marcus Boerger  [EMAIL PROTECTED]
+
+* .gdbinit:
+  - Add print_htptr, print_htstr
+
+* run-tests.php:
+  - Update copyright
+
+* run-tests.php:
+  - Make it executeable
+
+2007-05-20  Ilia Alshanetsky  [EMAIL PROTECTED]
+
+* sapi/cgi/tests/009.phpt
+  sapi/cgi/tests/009.phpt:
+  
+  file 009.phpt was initially added on branch PHP_5_2.
+
+* (PHP_5_2)
+  sapi/cgi/cgi_main.c:
+  Fixed a possible crash when PATH_INFO is not provided but the path 
contains
+  path info information
+
 2007-05-19  Pierre-Alain Joye  [EMAIL PROTECTED]
 
 * ext/zip/php_zip.c:

[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/cgi cgi_main.c /sapi/cgi/tests 009.phpt

2007-05-20 Thread Ilia Alshanetsky

iliaa   Sun May 20 15:56:10 2007 UTC

  Added files: (Branch: PHP_5_2)
/php-src/sapi/cgi/tests 009.phpt 

  Modified files:  
/php-src/sapi/cgi   cgi_main.c 
  Log:
  Fixed a possible crash when PATH_INFO is not provided but the path contains
  path info information
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.37r2=1.267.2.15.2.38diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.37 
php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.38
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.37 Tue May 15 08:17:08 2007
+++ php-src/sapi/cgi/cgi_main.c Sun May 20 15:56:09 2007
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: cgi_main.c,v 1.267.2.15.2.37 2007/05/15 08:17:08 dmitry Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.38 2007/05/20 15:56:09 iliaa Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -825,8 +825,8 @@
 * out what SCRIPT_NAME should 
be
 */
int slen = len - strlen(pt);
-   int pilen = 
strlen(env_path_info);
-   char *path_info = env_path_info 
+ pilen - slen;
+   int pilen = env_path_info ? 
strlen(env_path_info) : 0;
+   char *path_info = env_path_info 
? env_path_info + pilen - slen : NULL;
 
if (orig_path_info != 
path_info) {
if (orig_path_info) {
@@ -866,10 +866,12 @@
env_script_name = pt + 
l;
 
/* PATH_TRANSATED = 
DOCUMENT_ROOT + PATH_INFO */
-   path_translated_len = l 
+ strlen(env_path_info);
+   path_translated_len = l 
+ (env_path_info ? strlen(env_path_info) : 0);
path_translated = (char 
*) emalloc(path_translated_len + 1);
memcpy(path_translated, 
env_document_root, l);
-   memcpy(path_translated 
+ l, env_path_info, (path_translated_len - l));
+   if (env_path_info) {
+   
memcpy(path_translated + l, env_path_info, (path_translated_len - l));
+   }

path_translated[path_translated_len] = '\0';
if 
(orig_path_translated) {

_sapi_cgibin_putenv(ORIG_PATH_TRANSLATED, orig_path_translated TSRMLS_CC);
@@ -881,12 +883,14 @@
) {
/* PATH_TRANSATED = 
PATH_TRANSATED - SCRIPT_NAME + PATH_INFO */
int ptlen = strlen(pt) 
- strlen(env_script_name);
-   int path_translated_len 
= ptlen + strlen(env_path_info);
+   int path_translated_len 
= ptlen + env_path_info ? strlen(env_path_info) : 0;
char *path_translated = 
NULL;
 
path_translated = (char 
*) emalloc(path_translated_len + 1);
memcpy(path_translated, 
pt, ptlen);
-   memcpy(path_translated 
+ ptlen, env_path_info, path_translated_len - ptlen);
+   if (env_path_info) {
+   
memcpy(path_translated + ptlen, env_path_info, path_translated_len - ptlen);
+   }

path_translated[path_translated_len] = '\0';
if 
(orig_path_translated) {

_sapi_cgibin_putenv(ORIG_PATH_TRANSLATED, orig_path_translated TSRMLS_CC);

http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/tests/009.phpt?view=markuprev=1.1
Index: php-src/sapi/cgi/tests/009.phpt
+++ php-src/sapi/cgi/tests/009.phpt

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

[PHP-CVS] cvs: php-src / run-tests.php

2007-05-20 Thread Marcus Boerger

helly   Sun May 20 18:24:16 2007 UTC

  Modified files:  
/php-srcrun-tests.php 
  Log:
  - Make it executeable
  
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.321r2=1.322diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.321 php-src/run-tests.php:1.322
--- php-src/run-tests.php:1.321 Wed May  2 15:25:32 2007
+++ php-src/run-tests.php   Sun May 20 18:24:15 2007
@@ -1,3 +1,4 @@
+#!/usr/bin/php
 ?php
 /*
+--+
@@ -23,7 +24,7 @@
+--+
  */
 
-/* $Id: run-tests.php,v 1.321 2007/05/02 15:25:32 tony2001 Exp $ */
+/* $Id: run-tests.php,v 1.322 2007/05/20 18:24:15 helly Exp $ */
 
 /* Sanity check to ensure that pcre extension needed by this script is 
available.
  * In the event it is not, print a nice error message indicating that this 
script will
@@ -405,7 +406,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
-   echo '$Revision: 1.321 $'.\n;
+   echo '$Revision: 1.322 $'.\n;
exit(1);
default:
echo Illegal switch specified!\n;

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

[PHP-CVS] cvs: php-src / run-tests.php

2007-05-20 Thread Marcus Boerger

helly   Sun May 20 18:29:43 2007 UTC

  Modified files:  
/php-srcrun-tests.php 
  Log:
  - Update copyright
  
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.322r2=1.323diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.322 php-src/run-tests.php:1.323
--- php-src/run-tests.php:1.322 Sun May 20 18:24:15 2007
+++ php-src/run-tests.php   Sun May 20 18:29:43 2007
@@ -4,7 +4,7 @@
+--+
| PHP Version 5|
+--+
-   | Copyright (c) 1997-2006 The PHP Group|
+   | Copyright (c) 1997-2007 The PHP Group|
+--+
| This source file is subject to version 3.01 of the PHP license,  |
| that is bundled with this package in the file LICENSE, and is|
@@ -24,7 +24,7 @@
+--+
  */
 
-/* $Id: run-tests.php,v 1.322 2007/05/20 18:24:15 helly Exp $ */
+/* $Id: run-tests.php,v 1.323 2007/05/20 18:29:43 helly Exp $ */
 
 /* Sanity check to ensure that pcre extension needed by this script is 
available.
  * In the event it is not, print a nice error message indicating that this 
script will
@@ -406,7 +406,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
-   echo '$Revision: 1.322 $'.\n;
+   echo '$Revision: 1.323 $'.\n;
exit(1);
default:
echo Illegal switch specified!\n;

-- 
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) / .gdbinit

2007-05-20 Thread Marcus Boerger

helly   Sun May 20 21:46:17 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src.gdbinit 
  Log:
  - MFH Add print_htptr, print_htstr
  
http://cvs.php.net/viewvc.cgi/php-src/.gdbinit?r1=1.10.4.3r2=1.10.4.3.2.1diff_format=u
Index: php-src/.gdbinit
diff -u php-src/.gdbinit:1.10.4.3 php-src/.gdbinit:1.10.4.3.2.1
--- php-src/.gdbinit:1.10.4.3   Fri May  5 15:49:41 2006
+++ php-src/.gdbinitSun May 20 21:46:17 2007
@@ -8,7 +8,7 @@
 end
 
 document executor_globals
-   portable way of accessing executor_globals
+   portable way of accessing executor_globals, set $eg
ZTS detection is automatically based on ext/standard module struct
 end
 
@@ -39,14 +39,18 @@
 end
 
 document printzv
-   prints content of zval 
+   prints zval contents
 end
 
 define printzv_contents
set $zvalue = $arg0
set $type = $zvalue-type
 
-   printf (refcount=%d) , $zvalue-refcount
+   printf (refcount=%d, $zvalue-refcount
+   if $zvalue-is_ref
+   printf ,is_ref
+   end
+   printf ) 
if $type == 0
printf NULL
end
@@ -69,7 +73,7 @@
if ! $arg1
printf {\n
set $ind = $ind + 1
-   print_ht $zvalue-value.ht
+   print_ht $zvalue-value.ht 1
set $ind = $ind - 1
set $i = $ind
while $i  0
@@ -103,7 +107,7 @@
printf (%d): , $ht-nNumOfElements
printf {\n
set $ind = $ind + 1
-   print_ht $ht
+   print_ht $ht 1
set $ind = $ind - 1
set $i = $ind
while $i  0
@@ -188,12 +192,10 @@
 end
 
 define print_ht
-   set $ht = $arg0
+   set $ht = (HashTable*)$arg0
set $p = $ht-pListHead
 
while $p != 0
-   set $zval = *(zval **)$p-pData
-
set $i = $ind
while $i  0
printf   
@@ -206,8 +208,18 @@
else
printf %d = , $p-h
end
+   
+   if $arg1 == 0
+   printf %p\n, (void*)$p-pData
+   end
+   if $arg1 == 1
+   set $zval = *(zval **)$p-pData
+   printzv $zval 1
+   end
+   if $arg1 == 2
+   printf %s\n, (char*)$p-pData
+   end
 
-   printzv $zval 1
set $p = $p-pListNext
end
 end
@@ -215,7 +227,7 @@
 define print_ht
set $ind = 1
printf [0x%08x] {\n, $arg0
-   print_ht $arg0
+   print_ht $arg0 1
printf }\n
 end
 
@@ -223,6 +235,28 @@
dumps elements of HashTable made of zval
 end
 
+define print_htptr
+   set $ind = 1
+   printf [0x%08x] {\n, $arg0
+   print_ht $arg0 0
+   printf }\n
+end
+
+document print_htptr
+   dumps elements of HashTable made of pointers
+end
+
+define print_htstr
+   set $ind = 1
+   printf [0x%08x] {\n, $arg0
+   print_ht $arg0 2
+   printf }\n
+end
+
+document print_htstr
+   dumps elements of HashTable made of strings
+end
+
 define print_ft
set $ht = $arg0
set $p = $ht-pListHead

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

[PHP-CVS-DAILY] cvs: php-src / ChangeLog

[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/cgi cgi_main.c /sapi/cgi/tests 009.phpt

[PHP-CVS] cvs: php-src / run-tests.php

[PHP-CVS] cvs: php-src / run-tests.php

[PHP-CVS] cvs: php-src(PHP_5_2) / .gdbinit

5 matches

Site Navigation

Mail list logo

Footer information