lbarnaud                Thu Sep 11 11:52:02 2008 UTC

  Added files:                 
    /php-src/ext/session/tests  rfc1867_disabled_2.phpt 
                                rfc1867_disabled.phpt 
                                rfc1867_invalid_settings_2.phpt 
                                rfc1867_invalid_settings.phpt 
                                rfc1867_no_name.phpt rfc1867.phpt 
                                rfc1867_sid_cookie.phpt 
                                rfc1867_sid_get_2.phpt 
                                rfc1867_sid_get.phpt 
                                rfc1867_sid_invalid.phpt 
                                rfc1867_sid_only_cookie_2.phpt 
                                rfc1867_sid_only_cookie.phpt 
                                rfc1867_sid_post.phpt 
  Log:
  Added tests
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/rfc1867_disabled_2.phpt?view=markup&rev=1.1
Index: php-src/ext/session/tests/rfc1867_disabled_2.phpt
+++ php-src/ext/session/tests/rfc1867_disabled_2.phpt
--TEST--
session rfc1867 disabled 2
--INI--
file_uploads=1
error_reporting=E_ALL&~E_NOTICE
comment=debug builds show some additional E_NOTICE errors
upload_max_filesize=1024
session.save_path=
session.name=PHPSESSID
session.use_cookies=1
session.use_only_cookies=0
session.upload_progress.enabled=1
session.upload_progress.prefix=upload_progress_
session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
session.upload_progress.freq=1%
--SKIPIF--
<?php include('skipif.inc'); ?>
--COOKIE--
PHPSESSID=rfc1867-tests
--GET--
PHPSESSID=rfc1867-tests-get
--POST_RAW--
Content-Type: multipart/form-data; 
boundary=---------------------------20896060251896012921717172737
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="PHPSESSID"

rfc1867-tests-post
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="file1"; filename="file1.txt"

1
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="file2"; filename="file2.txt"

2
-----------------------------20896060251896012921717172737--
--FILE--
<?php
session_start();
var_dump(session_id());
var_dump($_FILES);
var_dump($_SESSION["upload_progress_" . basename(__FILE__)]);
session_destroy();
?>
--EXPECTF--
string(%d) "rfc1867-tests"
array(2) {
  [%u|b%"file1"]=>
  array(5) {
    [%u|b%"name"]=>
    %string|unicode%(9) "file1.txt"
    [%u|b%"type"]=>
    %string|unicode%(0) ""
    [%u|b%"tmp_name"]=>
    %string|unicode%(%d) "%s"
    [%u|b%"error"]=>
    int(0)
    [%u|b%"size"]=>
    int(1)
  }
  [%u|b%"file2"]=>
  array(5) {
    [%u|b%"name"]=>
    %string|unicode%(9) "file2.txt"
    [%u|b%"type"]=>
    %string|unicode%(0) ""
    [%u|b%"tmp_name"]=>
    %string|unicode%(%d) "%s"
    [%u|b%"error"]=>
    int(0)
    [%u|b%"size"]=>
    int(1)
  }
}
NULL

http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/rfc1867_disabled.phpt?view=markup&rev=1.1
Index: php-src/ext/session/tests/rfc1867_disabled.phpt
+++ php-src/ext/session/tests/rfc1867_disabled.phpt
--TEST--
session rfc1867 disabled
--INI--
file_uploads=1
error_reporting=E_ALL&~E_NOTICE
comment=debug builds show some additional E_NOTICE errors
upload_max_filesize=1024
session.save_path=
session.name=PHPSESSID
session.use_cookies=1
session.use_only_cookies=0
session.upload_progress.enabled=0
session.upload_progress.prefix=upload_progress_
session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
session.upload_progress.freq=1%
--SKIPIF--
<?php include('skipif.inc'); ?>
--COOKIE--
PHPSESSID=rfc1867-tests
--GET--
PHPSESSID=rfc1867-tests-get
--POST_RAW--
Content-Type: multipart/form-data; 
boundary=---------------------------20896060251896012921717172737
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="PHPSESSID"

rfc1867-tests-post
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="file1"; filename="file1.txt"

1
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="file2"; filename="file2.txt"

2
-----------------------------20896060251896012921717172737--
--FILE--
<?php
session_start();
var_dump(session_id());
var_dump($_FILES);
var_dump($_SESSION["upload_progress_" . basename(__FILE__)]);
session_destroy();
?>
--EXPECTF--
string(%d) "rfc1867-tests"
array(2) {
  [%u|b%"file1"]=>
  array(5) {
    [%u|b%"name"]=>
    %string|unicode%(9) "file1.txt"
    [%u|b%"type"]=>
    %string|unicode%(0) ""
    [%u|b%"tmp_name"]=>
    %string|unicode%(%d) "%s"
    [%u|b%"error"]=>
    int(0)
    [%u|b%"size"]=>
    int(1)
  }
  [%u|b%"file2"]=>
  array(5) {
    [%u|b%"name"]=>
    %string|unicode%(9) "file2.txt"
    [%u|b%"type"]=>
    %string|unicode%(0) ""
    [%u|b%"tmp_name"]=>
    %string|unicode%(%d) "%s"
    [%u|b%"error"]=>
    int(0)
    [%u|b%"size"]=>
    int(1)
  }
}
NULL

http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/rfc1867_invalid_settings_2.phpt?view=markup&rev=1.1
Index: php-src/ext/session/tests/rfc1867_invalid_settings_2.phpt
+++ php-src/ext/session/tests/rfc1867_invalid_settings_2.phpt
--TEST--
session rfc1867 invalid settings 2
--INI--
session.upload_progress.freq=200%
--SKIPIF--
<?php include('skipif.inc'); ?>
--FILE--
<?php
var_dump(ini_get("session.upload_progress.freq"));
?>
--EXPECTF--
PHP Warning:  PHP Startup: session.upload_progress.freq cannot be over 100% in 
%s

Warning: PHP Startup: session.upload_progress.freq cannot be over 100% in %s
%unicode|string%(%d) "1%"

http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/rfc1867_invalid_settings.phpt?view=markup&rev=1.1
Index: php-src/ext/session/tests/rfc1867_invalid_settings.phpt
+++ php-src/ext/session/tests/rfc1867_invalid_settings.phpt
--TEST--
session rfc1867 invalid settings
--INI--
session.upload_progress.freq=-1
--SKIPIF--
<?php include('skipif.inc'); ?>
--FILE--
<?php
var_dump(ini_get("session.upload_progress.freq"));
?>
--EXPECTF--
PHP Warning:  PHP Startup: session.upload_progress.freq must be greater than or 
equal to zero in %s

Warning: PHP Startup: session.upload_progress.freq must be greater than or 
equal to zero in %s
%unicode|string%(%d) "1%"

http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/rfc1867_no_name.phpt?view=markup&rev=1.1
Index: php-src/ext/session/tests/rfc1867_no_name.phpt
+++ php-src/ext/session/tests/rfc1867_no_name.phpt
--TEST--
session rfc1867 no name
--INI--
file_uploads=1
error_reporting=E_ALL&~E_NOTICE
comment=debug builds show some additional E_NOTICE errors
upload_max_filesize=1024
session.save_path=
session.name=PHPSESSID
session.use_cookies=1
session.use_only_cookies=0
session.upload_progress.enabled=1
session.upload_progress.prefix=upload_progress_
session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
session.upload_progress.freq=1%
--SKIPIF--
<?php include('skipif.inc'); ?>
--COOKIE--
PHPSESSID=rfc1867-tests
--GET--
PHPSESSID=rfc1867-tests-get
--POST_RAW--
Content-Type: multipart/form-data; 
boundary=---------------------------20896060251896012921717172737
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="PHPSESSID"

rfc1867-tests-post
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="file1"; filename="file1.txt"

1
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="file2"; filename="file2.txt"

2
-----------------------------20896060251896012921717172737--
--FILE--
<?php
session_start();
var_dump(session_id());
var_dump($_FILES);
var_dump($_SESSION["upload_progress_" . basename(__FILE__)]);
session_destroy();
?>
--EXPECTF--
string(%d) "rfc1867-tests"
array(2) {
  [%u|b%"file1"]=>
  array(5) {
    [%u|b%"name"]=>
    %string|unicode%(9) "file1.txt"
    [%u|b%"type"]=>
    %string|unicode%(0) ""
    [%u|b%"tmp_name"]=>
    %string|unicode%(%d) "%s"
    [%u|b%"error"]=>
    int(0)
    [%u|b%"size"]=>
    int(1)
  }
  [%u|b%"file2"]=>
  array(5) {
    [%u|b%"name"]=>
    %string|unicode%(9) "file2.txt"
    [%u|b%"type"]=>
    %string|unicode%(0) ""
    [%u|b%"tmp_name"]=>
    %string|unicode%(%d) "%s"
    [%u|b%"error"]=>
    int(0)
    [%u|b%"size"]=>
    int(1)
  }
}
NULL

http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/rfc1867.phpt?view=markup&rev=1.1
Index: php-src/ext/session/tests/rfc1867.phpt
+++ php-src/ext/session/tests/rfc1867.phpt
--TEST--
session rfc1867
--INI--
file_uploads=1
error_reporting=E_ALL&~E_NOTICE
comment=debug builds show some additional E_NOTICE errors
upload_max_filesize=1024
session.save_path=
session.name=PHPSESSID
session.use_cookies=1
session.use_only_cookies=0
session.upload_progress.enabled=1
session.upload_progress.prefix=upload_progress_
session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
session.upload_progress.freq=1%
--SKIPIF--
<?php include('skipif.inc'); ?>
--COOKIE--
PHPSESSID=rfc1867-tests
--GET--
PHPSESSID=rfc1867-tests-get
--POST_RAW--
Content-Type: multipart/form-data; 
boundary=---------------------------20896060251896012921717172737
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="PHPSESSID"

rfc1867-tests-post
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="PHP_SESSION_UPLOAD_PROGRESS"

rfc1867.php
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="file1"; filename="file1.txt"

1
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="file2"; filename="file2.txt"

2
-----------------------------20896060251896012921717172737--
--FILE--
<?php
session_start();
var_dump(session_id());
var_dump(basename(__FILE__) == $_POST[ini_get("session.upload_progress.name")]);
var_dump($_FILES);
var_dump($_SESSION["upload_progress_" . basename(__FILE__)]);
session_destroy();
?>
--EXPECTF--
string(%d) "rfc1867-tests"
bool(true)
array(2) {
  [%u|b%"file1"]=>
  array(5) {
    [%u|b%"name"]=>
    %string|unicode%(9) "file1.txt"
    [%u|b%"type"]=>
    %string|unicode%(0) ""
    [%u|b%"tmp_name"]=>
    %string|unicode%(%d) "%s"
    [%u|b%"error"]=>
    int(0)
    [%u|b%"size"]=>
    int(1)
  }
  [%u|b%"file2"]=>
  array(5) {
    [%u|b%"name"]=>
    %string|unicode%(9) "file2.txt"
    [%u|b%"type"]=>
    %string|unicode%(0) ""
    [%u|b%"tmp_name"]=>
    %string|unicode%(%d) "%s"
    [%u|b%"error"]=>
    int(0)
    [%u|b%"size"]=>
    int(1)
  }
}
array(5) {
  [%u|b%"start_time"]=>
  int(%d)
  [%u|b%"content_length"]=>
  int(%d)
  [%u|b%"bytes_processed"]=>
  int(%d)
  [%u|b%"done"]=>
  bool(true)
  [%u|b%"files"]=>
  array(2) {
    [0]=>
    array(7) {
      [%u|b%"field_name"]=>
      %unicode|string%(5) "file1"
      [%u|b%"name"]=>
      %unicode|string%(9) "file1.txt"
      [%u|b%"tmp_name"]=>
      %unicode|string%(%d) "%s"
      [%u|b%"error"]=>
      int(0)
      [%u|b%"done"]=>
      bool(true)
      [%u|b%"start_time"]=>
      int(%d)
      [%u|b%"bytes_processed"]=>
      int(1)
    }
    [1]=>
    array(7) {
      [%u|b%"field_name"]=>
      %unicode|string%(5) "file2"
      [%u|b%"name"]=>
      %unicode|string%(9) "file2.txt"
      [%u|b%"tmp_name"]=>
      %unicode|string%(%d) "%s"
      [%u|b%"error"]=>
      int(0)
      [%u|b%"done"]=>
      bool(true)
      [%u|b%"start_time"]=>
      int(%d)
      [%u|b%"bytes_processed"]=>
      int(1)
    }
  }
}

http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/rfc1867_sid_cookie.phpt?view=markup&rev=1.1
Index: php-src/ext/session/tests/rfc1867_sid_cookie.phpt
+++ php-src/ext/session/tests/rfc1867_sid_cookie.phpt
--TEST--
session rfc1867 sid cookie
--INI--
file_uploads=1
error_reporting=E_ALL&~E_NOTICE
comment=debug builds show some additional E_NOTICE errors
upload_max_filesize=1024
session.save_path=
session.name=PHPSESSID
session.use_cookies=1
session.use_only_cookies=0
session.upload_progress.enabled=1
session.upload_progress.prefix=upload_progress_
session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
session.upload_progress.freq=0
--SKIPIF--
<?php include('skipif.inc'); ?>
--COOKIE--
PHPSESSID=rfc1867-tests
--GET--
PHPSESSID=rfc1867-tests-get
--POST_RAW--
Content-Type: multipart/form-data; 
boundary=---------------------------20896060251896012921717172737
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="PHPSESSID"

rfc1867-tests-post
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="PHP_SESSION_UPLOAD_PROGRESS"

rfc1867_sid_cookie.php
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="file1"; filename="file1.txt"

1
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="file2"; filename="file2.txt"

2
-----------------------------20896060251896012921717172737--
--FILE--
<?php
session_start();
var_dump(session_id());
var_dump(basename(__FILE__) == $_POST[ini_get("session.upload_progress.name")]);
var_dump($_FILES);
var_dump($_SESSION["upload_progress_" . basename(__FILE__)]);
session_destroy();
?>
--EXPECTF--
string(%d) "rfc1867-tests"
bool(true)
array(2) {
  [%u|b%"file1"]=>
  array(5) {
    [%u|b%"name"]=>
    %string|unicode%(9) "file1.txt"
    [%u|b%"type"]=>
    %string|unicode%(0) ""
    [%u|b%"tmp_name"]=>
    %string|unicode%(%d) "%s"
    [%u|b%"error"]=>
    int(0)
    [%u|b%"size"]=>
    int(1)
  }
  [%u|b%"file2"]=>
  array(5) {
    [%u|b%"name"]=>
    %string|unicode%(9) "file2.txt"
    [%u|b%"type"]=>
    %string|unicode%(0) ""
    [%u|b%"tmp_name"]=>
    %string|unicode%(%d) "%s"
    [%u|b%"error"]=>
    int(0)
    [%u|b%"size"]=>
    int(1)
  }
}
array(5) {
  [%u|b%"start_time"]=>
  int(%d)
  [%u|b%"content_length"]=>
  int(%d)
  [%u|b%"bytes_processed"]=>
  int(%d)
  [%u|b%"done"]=>
  bool(true)
  [%u|b%"files"]=>
  array(2) {
    [0]=>
    array(7) {
      [%u|b%"field_name"]=>
      %unicode|string%(5) "file1"
      [%u|b%"name"]=>
      %unicode|string%(9) "file1.txt"
      [%u|b%"tmp_name"]=>
      %unicode|string%(%d) "%s"
      [%u|b%"error"]=>
      int(0)
      [%u|b%"done"]=>
      bool(true)
      [%u|b%"start_time"]=>
      int(%d)
      [%u|b%"bytes_processed"]=>
      int(1)
    }
    [1]=>
    array(7) {
      [%u|b%"field_name"]=>
      %unicode|string%(5) "file2"
      [%u|b%"name"]=>
      %unicode|string%(9) "file2.txt"
      [%u|b%"tmp_name"]=>
      %unicode|string%(%d) "%s"
      [%u|b%"error"]=>
      int(0)
      [%u|b%"done"]=>
      bool(true)
      [%u|b%"start_time"]=>
      int(%d)
      [%u|b%"bytes_processed"]=>
      int(1)
    }
  }
}

http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/rfc1867_sid_get_2.phpt?view=markup&rev=1.1
Index: php-src/ext/session/tests/rfc1867_sid_get_2.phpt
+++ php-src/ext/session/tests/rfc1867_sid_get_2.phpt
--TEST--
session rfc1867 sid get 2
--INI--
file_uploads=1
error_reporting=E_ALL&~E_NOTICE
comment=debug builds show some additional E_NOTICE errors
upload_max_filesize=1024
session.save_path=
session.name=PHPSESSID
session.use_cookies=0
session.use_only_cookies=0
session.upload_progress.enabled=1
session.upload_progress.prefix=upload_progress_
session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
session.upload_progress.freq=0
--SKIPIF--
<?php include('skipif.inc'); ?>
--COOKIE--
PHPSESSID=rfc1867-tests-cookie
--GET--
PHPSESSID=rfc1867-tests
--POST_RAW--
Content-Type: multipart/form-data; 
boundary=---------------------------20896060251896012921717172737
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="PHPSESSID"

rfc1867-tests-post
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="PHP_SESSION_UPLOAD_PROGRESS"

rfc1867_sid_get_2.php
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="file1"; filename="file1.txt"

1
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="file2"; filename="file2.txt"

2
-----------------------------20896060251896012921717172737--
--FILE--
<?php
session_start();
var_dump(session_id());
var_dump(basename(__FILE__) == $_POST[ini_get("session.upload_progress.name")]);
var_dump($_FILES);
var_dump($_SESSION["upload_progress_" . basename(__FILE__)]);
session_destroy();
?>
--EXPECTF--
string(%d) "rfc1867-tests"
bool(true)
array(2) {
  [%u|b%"file1"]=>
  array(5) {
    [%u|b%"name"]=>
    %string|unicode%(9) "file1.txt"
    [%u|b%"type"]=>
    %string|unicode%(0) ""
    [%u|b%"tmp_name"]=>
    %string|unicode%(%d) "%s"
    [%u|b%"error"]=>
    int(0)
    [%u|b%"size"]=>
    int(1)
  }
  [%u|b%"file2"]=>
  array(5) {
    [%u|b%"name"]=>
    %string|unicode%(9) "file2.txt"
    [%u|b%"type"]=>
    %string|unicode%(0) ""
    [%u|b%"tmp_name"]=>
    %string|unicode%(%d) "%s"
    [%u|b%"error"]=>
    int(0)
    [%u|b%"size"]=>
    int(1)
  }
}
array(5) {
  [%u|b%"start_time"]=>
  int(%d)
  [%u|b%"content_length"]=>
  int(%d)
  [%u|b%"bytes_processed"]=>
  int(%d)
  [%u|b%"done"]=>
  bool(true)
  [%u|b%"files"]=>
  array(2) {
    [0]=>
    array(7) {
      [%u|b%"field_name"]=>
      %unicode|string%(5) "file1"
      [%u|b%"name"]=>
      %unicode|string%(9) "file1.txt"
      [%u|b%"tmp_name"]=>
      %unicode|string%(%d) "%s"
      [%u|b%"error"]=>
      int(0)
      [%u|b%"done"]=>
      bool(true)
      [%u|b%"start_time"]=>
      int(%d)
      [%u|b%"bytes_processed"]=>
      int(1)
    }
    [1]=>
    array(7) {
      [%u|b%"field_name"]=>
      %unicode|string%(5) "file2"
      [%u|b%"name"]=>
      %unicode|string%(9) "file2.txt"
      [%u|b%"tmp_name"]=>
      %unicode|string%(%d) "%s"
      [%u|b%"error"]=>
      int(0)
      [%u|b%"done"]=>
      bool(true)
      [%u|b%"start_time"]=>
      int(%d)
      [%u|b%"bytes_processed"]=>
      int(1)
    }
  }
}

http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/rfc1867_sid_get.phpt?view=markup&rev=1.1
Index: php-src/ext/session/tests/rfc1867_sid_get.phpt
+++ php-src/ext/session/tests/rfc1867_sid_get.phpt
--TEST--
session rfc1867 sid get
--INI--
file_uploads=1
error_reporting=E_ALL&~E_NOTICE
comment=debug builds show some additional E_NOTICE errors
upload_max_filesize=1024
session.save_path=
session.name=PHPSESSID
session.use_cookies=1
session.use_only_cookies=0
session.upload_progress.enabled=1
session.upload_progress.prefix=upload_progress_
session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
session.upload_progress.freq=0
--SKIPIF--
<?php include('skipif.inc'); ?>
--GET--
PHPSESSID=rfc1867-tests
--POST_RAW--
Content-Type: multipart/form-data; 
boundary=---------------------------20896060251896012921717172737
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="PHPSESSID"

rfc1867-tests-post
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="PHP_SESSION_UPLOAD_PROGRESS"

rfc1867_sid_get.php
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="file1"; filename="file1.txt"

1
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="file2"; filename="file2.txt"

2
-----------------------------20896060251896012921717172737--
--FILE--
<?php
session_start();
var_dump(session_id());
var_dump(basename(__FILE__) == $_POST[ini_get("session.upload_progress.name")]);
var_dump($_FILES);
var_dump($_SESSION["upload_progress_" . basename(__FILE__)]);
session_destroy();
?>
--EXPECTF--
string(%d) "rfc1867-tests"
bool(true)
array(2) {
  [%u|b%"file1"]=>
  array(5) {
    [%u|b%"name"]=>
    %string|unicode%(9) "file1.txt"
    [%u|b%"type"]=>
    %string|unicode%(0) ""
    [%u|b%"tmp_name"]=>
    %string|unicode%(%d) "%s"
    [%u|b%"error"]=>
    int(0)
    [%u|b%"size"]=>
    int(1)
  }
  [%u|b%"file2"]=>
  array(5) {
    [%u|b%"name"]=>
    %string|unicode%(9) "file2.txt"
    [%u|b%"type"]=>
    %string|unicode%(0) ""
    [%u|b%"tmp_name"]=>
    %string|unicode%(%d) "%s"
    [%u|b%"error"]=>
    int(0)
    [%u|b%"size"]=>
    int(1)
  }
}
array(5) {
  [%u|b%"start_time"]=>
  int(%d)
  [%u|b%"content_length"]=>
  int(%d)
  [%u|b%"bytes_processed"]=>
  int(%d)
  [%u|b%"done"]=>
  bool(true)
  [%u|b%"files"]=>
  array(2) {
    [0]=>
    array(7) {
      [%u|b%"field_name"]=>
      %unicode|string%(5) "file1"
      [%u|b%"name"]=>
      %unicode|string%(9) "file1.txt"
      [%u|b%"tmp_name"]=>
      %unicode|string%(%d) "%s"
      [%u|b%"error"]=>
      int(0)
      [%u|b%"done"]=>
      bool(true)
      [%u|b%"start_time"]=>
      int(%d)
      [%u|b%"bytes_processed"]=>
      int(1)
    }
    [1]=>
    array(7) {
      [%u|b%"field_name"]=>
      %unicode|string%(5) "file2"
      [%u|b%"name"]=>
      %unicode|string%(9) "file2.txt"
      [%u|b%"tmp_name"]=>
      %unicode|string%(%d) "%s"
      [%u|b%"error"]=>
      int(0)
      [%u|b%"done"]=>
      bool(true)
      [%u|b%"start_time"]=>
      int(%d)
      [%u|b%"bytes_processed"]=>
      int(1)
    }
  }
}

http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/rfc1867_sid_invalid.phpt?view=markup&rev=1.1
Index: php-src/ext/session/tests/rfc1867_sid_invalid.phpt
+++ php-src/ext/session/tests/rfc1867_sid_invalid.phpt
--TEST--
session rfc1867 sid cookie
--INI--
file_uploads=1
error_reporting=E_ALL&~E_NOTICE
comment=debug builds show some additional E_NOTICE errors
upload_max_filesize=1024
session.save_path=
session.name=PHPSESSID
session.use_cookies=1
session.use_only_cookies=0
session.auto_start=0
session.upload_progress.enabled=1
session.upload_progress.prefix=upload_progress_
session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
session.upload_progress.freq=0
--SKIPIF--
<?php include('skipif.inc'); ?>
--COOKIE--
PHPSESSID=_
--POST_RAW--
Content-Type: multipart/form-data; 
boundary=---------------------------20896060251896012921717172737
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="PHP_SESSION_UPLOAD_PROGRESS"

rfc1867_sid_invalid.php
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="file1"; filename="file1.txt"

1
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="file2"; filename="file2.txt"

2
-----------------------------20896060251896012921717172737--
--FILE--
<?php
error_reporting(0);
session_start();
var_dump(session_id());
var_dump(basename(__FILE__) == $_POST[ini_get("session.upload_progress.name")]);
var_dump($_FILES);
var_dump($_SESSION["upload_progress_" . basename(__FILE__)]);
session_destroy();
?>
--EXPECTF--
Warning: Unknown: The session id contains illegal characters, valid characters 
are a-z, A-Z, 0-9 and '-,' in Unknown on line 0
string(%d) "%s"
bool(true)
array(2) {
  [%u|b%"file1"]=>
  array(5) {
    [%u|b%"name"]=>
    %string|unicode%(9) "file1.txt"
    [%u|b%"type"]=>
    %string|unicode%(0) ""
    [%u|b%"tmp_name"]=>
    %string|unicode%(%d) "%s"
    [%u|b%"error"]=>
    int(0)
    [%u|b%"size"]=>
    int(1)
  }
  [%u|b%"file2"]=>
  array(5) {
    [%u|b%"name"]=>
    %string|unicode%(9) "file2.txt"
    [%u|b%"type"]=>
    %string|unicode%(0) ""
    [%u|b%"tmp_name"]=>
    %string|unicode%(%d) "%s"
    [%u|b%"error"]=>
    int(0)
    [%u|b%"size"]=>
    int(1)
  }
}
NULL

http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/rfc1867_sid_only_cookie_2.phpt?view=markup&rev=1.1
Index: php-src/ext/session/tests/rfc1867_sid_only_cookie_2.phpt
+++ php-src/ext/session/tests/rfc1867_sid_only_cookie_2.phpt
--TEST--
session rfc1867 sid only cookie 2
--INI--
file_uploads=1
error_reporting=E_ALL&~E_NOTICE
comment=debug builds show some additional E_NOTICE errors
upload_max_filesize=1024
session.save_path=
session.name=PHPSESSID
session.use_cookies=1
session.use_only_cookies=1
session.upload_progress.enabled=1
session.upload_progress.prefix=upload_progress_
session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
session.upload_progress.freq=0
--SKIPIF--
<?php include('skipif.inc'); ?>
--GET--
PHPSESSID=rfc1867-tests-get
--POST_RAW--
Content-Type: multipart/form-data; 
boundary=---------------------------20896060251896012921717172737
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="PHPSESSID"

rfc1867-tests-post
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="PHP_SESSION_UPLOAD_PROGRESS"

rfc1867_sid_only_cookie_2.php
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="file1"; filename="file1.txt"

1
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="file2"; filename="file2.txt"

2
-----------------------------20896060251896012921717172737--
--FILE--
<?php
session_start();
var_dump(session_id());
var_dump(basename(__FILE__) == $_POST[ini_get("session.upload_progress.name")]);
var_dump($_FILES);
var_dump($_SESSION["upload_progress_" . basename(__FILE__)]);
session_destroy();
?>
--EXPECTF--
string(%d) "%s"
bool(true)
array(2) {
  [%u|b%"file1"]=>
  array(5) {
    [%u|b%"name"]=>
    %string|unicode%(9) "file1.txt"
    [%u|b%"type"]=>
    %string|unicode%(0) ""
    [%u|b%"tmp_name"]=>
    %string|unicode%(%d) "%s"
    [%u|b%"error"]=>
    int(0)
    [%u|b%"size"]=>
    int(1)
  }
  [%u|b%"file2"]=>
  array(5) {
    [%u|b%"name"]=>
    %string|unicode%(9) "file2.txt"
    [%u|b%"type"]=>
    %string|unicode%(0) ""
    [%u|b%"tmp_name"]=>
    %string|unicode%(%d) "%s"
    [%u|b%"error"]=>
    int(0)
    [%u|b%"size"]=>
    int(1)
  }
}
NULL

http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/rfc1867_sid_only_cookie.phpt?view=markup&rev=1.1
Index: php-src/ext/session/tests/rfc1867_sid_only_cookie.phpt
+++ php-src/ext/session/tests/rfc1867_sid_only_cookie.phpt
--TEST--
session rfc1867 sid only cookie
--INI--
file_uploads=1
error_reporting=E_ALL&~E_NOTICE
comment=debug builds show some additional E_NOTICE errors
upload_max_filesize=1024
session.save_path=
session.name=PHPSESSID
session.use_cookies=1
session.use_only_cookies=1
session.upload_progress.enabled=1
session.upload_progress.prefix=upload_progress_
session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
session.upload_progress.freq=0
--SKIPIF--
<?php include('skipif.inc'); ?>
--COOKIE--
PHPSESSID=rfc1867-tests
--GET--
PHPSESSID=rfc1867-tests-get
--POST_RAW--
Content-Type: multipart/form-data; 
boundary=---------------------------20896060251896012921717172737
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="PHPSESSID"

rfc1867-tests-post
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="PHP_SESSION_UPLOAD_PROGRESS"

rfc1867_sid_only_cookie.php
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="file1"; filename="file1.txt"

1
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="file2"; filename="file2.txt"

2
-----------------------------20896060251896012921717172737--
--FILE--
<?php
session_start();
var_dump(session_id());
var_dump(basename(__FILE__) == $_POST[ini_get("session.upload_progress.name")]);
var_dump($_FILES);
var_dump($_SESSION["upload_progress_" . basename(__FILE__)]);
session_destroy();
?>
--EXPECTF--
string(%d) "rfc1867-tests"
bool(true)
array(2) {
  [%u|b%"file1"]=>
  array(5) {
    [%u|b%"name"]=>
    %string|unicode%(9) "file1.txt"
    [%u|b%"type"]=>
    %string|unicode%(0) ""
    [%u|b%"tmp_name"]=>
    %string|unicode%(%d) "%s"
    [%u|b%"error"]=>
    int(0)
    [%u|b%"size"]=>
    int(1)
  }
  [%u|b%"file2"]=>
  array(5) {
    [%u|b%"name"]=>
    %string|unicode%(9) "file2.txt"
    [%u|b%"type"]=>
    %string|unicode%(0) ""
    [%u|b%"tmp_name"]=>
    %string|unicode%(%d) "%s"
    [%u|b%"error"]=>
    int(0)
    [%u|b%"size"]=>
    int(1)
  }
}
array(5) {
  [%u|b%"start_time"]=>
  int(%d)
  [%u|b%"content_length"]=>
  int(%d)
  [%u|b%"bytes_processed"]=>
  int(%d)
  [%u|b%"done"]=>
  bool(true)
  [%u|b%"files"]=>
  array(2) {
    [0]=>
    array(7) {
      [%u|b%"field_name"]=>
      %unicode|string%(5) "file1"
      [%u|b%"name"]=>
      %unicode|string%(9) "file1.txt"
      [%u|b%"tmp_name"]=>
      %unicode|string%(%d) "%s"
      [%u|b%"error"]=>
      int(0)
      [%u|b%"done"]=>
      bool(true)
      [%u|b%"start_time"]=>
      int(%d)
      [%u|b%"bytes_processed"]=>
      int(1)
    }
    [1]=>
    array(7) {
      [%u|b%"field_name"]=>
      %unicode|string%(5) "file2"
      [%u|b%"name"]=>
      %unicode|string%(9) "file2.txt"
      [%u|b%"tmp_name"]=>
      %unicode|string%(%d) "%s"
      [%u|b%"error"]=>
      int(0)
      [%u|b%"done"]=>
      bool(true)
      [%u|b%"start_time"]=>
      int(%d)
      [%u|b%"bytes_processed"]=>
      int(1)
    }
  }
}

http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/rfc1867_sid_post.phpt?view=markup&rev=1.1
Index: php-src/ext/session/tests/rfc1867_sid_post.phpt
+++ php-src/ext/session/tests/rfc1867_sid_post.phpt
--TEST--
session rfc1867 sid post
--INI--
file_uploads=1
error_reporting=E_ALL&~E_NOTICE
comment=debug builds show some additional E_NOTICE errors
upload_max_filesize=1024
session.save_path=
session.name=PHPSESSID
session.use_cookies=1
session.use_only_cookies=0
session.upload_progress.enabled=1
session.upload_progress.prefix=upload_progress_
session.upload_progress.name=PHP_SESSION_UPLOAD_PROGRESS
session.upload_progress.freq=0
--SKIPIF--
<?php include('skipif.inc'); ?>
--POST_RAW--
Content-Type: multipart/form-data; 
boundary=---------------------------20896060251896012921717172737
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="PHPSESSID"

rfc1867-tests
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="PHP_SESSION_UPLOAD_PROGRESS"

rfc1867_sid_post.php
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="file1"; filename="file1.txt"

1
-----------------------------20896060251896012921717172737
Content-Disposition: form-data; name="file2"; filename="file2.txt"

2
-----------------------------20896060251896012921717172737--
--FILE--
<?php
session_start();
var_dump(session_id());
var_dump(basename(__FILE__) == $_POST[ini_get("session.upload_progress.name")]);
var_dump($_FILES);
var_dump($_SESSION["upload_progress_" . basename(__FILE__)]);
session_destroy();
?>
--EXPECTF--
string(%d) "rfc1867-tests"
bool(true)
array(2) {
  [%u|b%"file1"]=>
  array(5) {
    [%u|b%"name"]=>
    %string|unicode%(9) "file1.txt"
    [%u|b%"type"]=>
    %string|unicode%(0) ""
    [%u|b%"tmp_name"]=>
    %string|unicode%(%d) "%s"
    [%u|b%"error"]=>
    int(0)
    [%u|b%"size"]=>
    int(1)
  }
  [%u|b%"file2"]=>
  array(5) {
    [%u|b%"name"]=>
    %string|unicode%(9) "file2.txt"
    [%u|b%"type"]=>
    %string|unicode%(0) ""
    [%u|b%"tmp_name"]=>
    %string|unicode%(%d) "%s"
    [%u|b%"error"]=>
    int(0)
    [%u|b%"size"]=>
    int(1)
  }
}
array(5) {
  [%u|b%"start_time"]=>
  int(%d)
  [%u|b%"content_length"]=>
  int(%d)
  [%u|b%"bytes_processed"]=>
  int(%d)
  [%u|b%"done"]=>
  bool(true)
  [%u|b%"files"]=>
  array(2) {
    [0]=>
    array(7) {
      [%u|b%"field_name"]=>
      %unicode|string%(5) "file1"
      [%u|b%"name"]=>
      %unicode|string%(9) "file1.txt"
      [%u|b%"tmp_name"]=>
      %unicode|string%(%d) "%s"
      [%u|b%"error"]=>
      int(0)
      [%u|b%"done"]=>
      bool(true)
      [%u|b%"start_time"]=>
      int(%d)
      [%u|b%"bytes_processed"]=>
      int(1)
    }
    [1]=>
    array(7) {
      [%u|b%"field_name"]=>
      %unicode|string%(5) "file2"
      [%u|b%"name"]=>
      %unicode|string%(9) "file2.txt"
      [%u|b%"tmp_name"]=>
      %unicode|string%(%d) "%s"
      [%u|b%"error"]=>
      int(0)
      [%u|b%"done"]=>
      bool(true)
      [%u|b%"start_time"]=>
      int(%d)
      [%u|b%"bytes_processed"]=>
      int(1)
    }
  }
}

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

Reply via email to