mirror of
https://github.com/bdnugget/php-src.git
synced 2026-11-22 08:26:38 +00:00
Compare commits
141
Commits
PHP-5.3.12
...
php-5.3.14
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d41f74f089 | ||
|
|
2b7a26128a | ||
|
|
dd3fa4f896 | ||
|
|
c208ad9ddb | ||
|
|
e9e4819c1b | ||
|
|
438e03a354 | ||
|
|
095f7fc965 | ||
|
|
5ecabb302d | ||
|
|
6e51989501 | ||
|
|
4eb802bb14 | ||
|
|
93c91c733c | ||
|
|
1af8b3f883 | ||
|
|
3332943c9d | ||
|
|
950d5ee590 | ||
|
|
81ba6b14c7 | ||
|
|
266578f584 | ||
|
|
652632a89b | ||
|
|
f7d8b274c7 | ||
|
|
7fb16d5bd9 | ||
|
|
c12fdbde5f | ||
|
|
838b4b8ff7 | ||
|
|
d776a933eb | ||
|
|
3a4a25358f | ||
|
|
e120a0c7f3 | ||
|
|
000e84aa88 | ||
|
|
2068419ae5 | ||
|
|
ce59121c5f | ||
|
|
99076bc24f | ||
|
|
7ccd594392 | ||
|
|
304ac568c5 | ||
|
|
311ee8f69c | ||
|
|
3e9923dd8d | ||
|
|
4632fe0eef | ||
|
|
035ce937e1 | ||
|
|
168e8920be | ||
|
|
8a10259642 | ||
|
|
6c12252790 | ||
|
|
0956c00af9 | ||
|
|
bbf8a50281 | ||
|
|
69ed09a31c | ||
|
|
b42d000471 | ||
|
|
72507d38fb | ||
|
|
d14f23365c | ||
|
|
02e25df8b5 | ||
|
|
c864b1ca2f | ||
|
|
d26e006d7f | ||
|
|
ec5421d044 | ||
|
|
680685127f | ||
|
|
8249581a2d | ||
|
|
a601605f14 | ||
|
|
d80a3d9668 | ||
|
|
24d85e4bd8 | ||
|
|
bae56a87f8 | ||
|
|
9aff3a1156 | ||
|
|
d44a383986 | ||
|
|
e52be10b30 | ||
|
|
dc6d283b1c | ||
|
|
4daab0abec | ||
|
|
4e9db5ba9f | ||
|
|
433290e199 | ||
|
|
270a406ac9 | ||
|
|
8d748e5de5 | ||
|
|
c8865e3b84 | ||
|
|
da1b534601 | ||
|
|
f13b0ede07 | ||
|
|
c06e92a533 | ||
|
|
2e9eb5e32f | ||
|
|
dd34fe52b9 | ||
|
|
c3b0fb4fbe | ||
|
|
5cbf2d6785 | ||
|
|
c06ec6bde4 | ||
|
|
1b78aef426 | ||
|
|
adfb4c62b7 | ||
|
|
2827324c7c | ||
|
|
4650b2164b | ||
|
|
710021d1d4 | ||
|
|
e946eaca0b | ||
|
|
dda60f3014 | ||
|
|
f3d86b314f | ||
|
|
bceafee879 | ||
|
|
9c8907ec10 | ||
|
|
1c435ae498 | ||
|
|
47e7755785 | ||
|
|
4fa1743009 | ||
|
|
aaed0af418 | ||
|
|
163c1a393f | ||
|
|
c981016e41 | ||
|
|
9a4cb732ed | ||
|
|
21d314a767 | ||
|
|
e9b978c374 | ||
|
|
e0d5138660 | ||
|
|
8c4294bcb4 | ||
|
|
1461a40301 | ||
|
|
3f3ad30c50 | ||
|
|
1c8fccdf6d | ||
|
|
ed0ddd20c5 | ||
|
|
b0cb29db87 | ||
|
|
b9cbb9e744 | ||
|
|
fde96342e8 | ||
|
|
b2f2e1d6cc | ||
|
|
b3be5d920a | ||
|
|
15e26c6d4a | ||
|
|
af8646c188 | ||
|
|
c4676ee99f | ||
|
|
5594fcf423 | ||
|
|
37cb29ae90 | ||
|
|
d80e2e069c | ||
|
|
26dbc5ecb4 | ||
|
|
2ca49d39a3 | ||
|
|
d89b65f985 | ||
|
|
4ff55e646a | ||
|
|
0f180a63eb | ||
|
|
9bf8cd4b34 | ||
|
|
381edb425e | ||
|
|
db834fc460 | ||
|
|
94f1c05ff8 | ||
|
|
ca58cd01fc | ||
|
|
f7bf83546e | ||
|
|
896c4539df | ||
|
|
7b04638c8c | ||
|
|
438536e45e | ||
|
|
14e74aeb57 | ||
|
|
94cefaedaf | ||
|
|
469cd3abf1 | ||
|
|
6d97e28e42 | ||
|
|
a6c95c8a00 | ||
|
|
8684fb7fac | ||
|
|
909713e233 | ||
|
|
0cdba53aae | ||
|
|
55a6f3a12d | ||
|
|
0e53ac49e6 | ||
|
|
66b3b44fd5 | ||
|
|
ff8be9845f | ||
|
|
132d7113ea | ||
|
|
c56cfbd234 | ||
|
|
6b4112c98a | ||
|
|
97f4fc22c5 | ||
|
|
c0f806a69c | ||
|
|
e1352b0416 | ||
|
|
8449e0ca89 | ||
|
|
fb124764de |
No files matched your search
+149
@@ -22,3 +22,152 @@ sapi/continuity/capi.c ident
|
||||
Zend/RFCs/002.txt ident
|
||||
Zend/RFCs/003.txt ident
|
||||
NEWS merge=NEWS
|
||||
/ext/bz2/tests/005.phpt -crlf
|
||||
/ext/dom/tests/dom005.phpt -crlf
|
||||
/ext/dom/tests/DOMImplementation_createDocumentType_basic.phpt -crlf
|
||||
/ext/ereg/tests/009.phpt -crlf
|
||||
/ext/iconv/tests/eucjp2sjis.phpt -crlf
|
||||
/ext/iconv/tests/eucjp2utf8.phpt -crlf
|
||||
/ext/iconv/tests/iconv_stream_filter_delimiter.phpt -crlf
|
||||
/ext/iconv/tests/iconv_stream_filter.phpt -crlf
|
||||
/ext/mbstring/tests/mb_split-compat-01.phpt -crlf
|
||||
/ext/phar/tests/005.phpt -crlf
|
||||
/ext/phar/tests/phar_commitwrite.phpt -crlf
|
||||
/ext/phar/tests/phar_create_in_cwd.phpt -crlf
|
||||
/ext/phar/tests/phar_mount.phpt -crlf
|
||||
/ext/reflection/tests/009.phpt -crlf
|
||||
/ext/reflection/tests/025.phpt -crlf
|
||||
/ext/standard/tests/general_functions/highlight_heredoc.phpt -crlf
|
||||
/ext/standard/tests/general_functions/parse_ini_file.phpt -crlf
|
||||
/ext/standard/tests/general_functions/parse_ini_string_002.phpt -crlf
|
||||
/ext/standard/tests/strings/006.phpt -crlf
|
||||
/ext/standard/tests/strings/addslashes_variation2.phpt -crlf
|
||||
/ext/standard/tests/strings/addslashes_variation3.phpt -crlf
|
||||
/ext/standard/tests/strings/bug21453.phpt -crlf
|
||||
/ext/standard/tests/strings/chop_variation3.phpt -crlf
|
||||
/ext/standard/tests/strings/chunk_split_variation11.phpt -crlf
|
||||
/ext/standard/tests/strings/chunk_split_variation12.phpt -crlf
|
||||
/ext/standard/tests/strings/chunk_split_variation4.phpt -crlf
|
||||
/ext/standard/tests/strings/crc32_variation2.phpt -crlf
|
||||
/ext/standard/tests/strings/crc32_variation3.phpt -crlf
|
||||
/ext/standard/tests/strings/crc32_variation4.phpt -crlf
|
||||
/ext/standard/tests/strings/highlight_file.phpt -crlf
|
||||
/ext/standard/tests/strings/htmlentities_html4.phpt -crlf
|
||||
/ext/standard/tests/strings/lcfirst.phpt -crlf
|
||||
/ext/standard/tests/strings/ltrim.phpt -crlf
|
||||
/ext/standard/tests/strings/nl2br_variation2.phpt -crlf
|
||||
/ext/standard/tests/strings/php_strip_whitespace.phpt -crlf
|
||||
/ext/standard/tests/strings/rtrim.phpt -crlf
|
||||
/ext/standard/tests/strings/sprintf_f_2.phpt -crlf
|
||||
/ext/standard/tests/strings/sprintf_variation15.phpt -crlf
|
||||
/ext/standard/tests/strings/strcspn_variation6.phpt -crlf
|
||||
/ext/standard/tests/strings/strcspn_variation7.phpt -crlf
|
||||
/ext/standard/tests/strings/strcspn_variation8.phpt -crlf
|
||||
/ext/standard/tests/strings/stripos_variation1.phpt -crlf
|
||||
/ext/standard/tests/strings/stripos_variation3.phpt -crlf
|
||||
/ext/standard/tests/strings/stripos_variation4.phpt -crlf
|
||||
/ext/standard/tests/strings/stripos_variation5.phpt -crlf
|
||||
/ext/standard/tests/strings/stripos_variation6.phpt -crlf
|
||||
/ext/standard/tests/strings/stripslashes_variation2.phpt -crlf
|
||||
/ext/standard/tests/strings/stripslashes_variation3.phpt -crlf
|
||||
/ext/standard/tests/strings/stripslashes_variation4.phpt -crlf
|
||||
/ext/standard/tests/strings/stripslashes_variation5.phpt -crlf
|
||||
/ext/standard/tests/strings/str_ireplace.phpt -crlf
|
||||
/ext/standard/tests/strings/strnatcmp_basic.phpt -crlf
|
||||
/ext/standard/tests/strings/strncasecmp_variation9.phpt -crlf
|
||||
/ext/standard/tests/strings/strpos.phpt -crlf
|
||||
/ext/standard/tests/strings/strrchr_variation1.phpt -crlf
|
||||
/ext/standard/tests/strings/strrchr_variation2.phpt -crlf
|
||||
/ext/standard/tests/strings/strrchr_variation3.phpt -crlf
|
||||
/ext/standard/tests/strings/strrchr_variation4.phpt -crlf
|
||||
/ext/standard/tests/strings/strrchr_variation6.phpt -crlf
|
||||
/ext/standard/tests/strings/strrchr_variation7.phpt -crlf
|
||||
/ext/standard/tests/strings/str_replace.phpt -crlf
|
||||
/ext/standard/tests/strings/strrev_variation3.phpt -crlf
|
||||
/ext/standard/tests/strings/strrev_variation4.phpt -crlf
|
||||
/ext/standard/tests/strings/strripos_variation1.phpt -crlf
|
||||
/ext/standard/tests/strings/strripos_variation2.phpt -crlf
|
||||
/ext/standard/tests/strings/strripos_variation3.phpt -crlf
|
||||
/ext/standard/tests/strings/strripos_variation4.phpt -crlf
|
||||
/ext/standard/tests/strings/strripos_variation5.phpt -crlf
|
||||
/ext/standard/tests/strings/strrpos_variation1.phpt -crlf
|
||||
/ext/standard/tests/strings/strrpos_variation2.phpt -crlf
|
||||
/ext/standard/tests/strings/strrpos_variation3.phpt -crlf
|
||||
/ext/standard/tests/strings/strrpos_variation4.phpt -crlf
|
||||
/ext/standard/tests/strings/strrpos_variation5.phpt -crlf
|
||||
/ext/standard/tests/strings/strrpos_variation6.phpt -crlf
|
||||
/ext/standard/tests/strings/strspn_variation5.phpt -crlf
|
||||
/ext/standard/tests/strings/strspn_variation6.phpt -crlf
|
||||
/ext/standard/tests/strings/strspn_variation7.phpt -crlf
|
||||
/ext/standard/tests/strings/strspn_variation8.phpt -crlf
|
||||
/ext/standard/tests/strings/strstr.phpt -crlf
|
||||
/ext/standard/tests/strings/strtok_variation1.phpt -crlf
|
||||
/ext/standard/tests/strings/strtok_variation3.phpt -crlf
|
||||
/ext/standard/tests/strings/strtr_variation1.phpt -crlf
|
||||
/ext/standard/tests/strings/strtr_variation2.phpt -crlf
|
||||
/ext/standard/tests/strings/str_word_count.phpt -crlf
|
||||
/ext/standard/tests/strings/trim1.phpt -crlf
|
||||
/ext/standard/tests/strings/ucfirst.phpt -crlf
|
||||
/ext/standard/tests/strings/vfprintf_variation10.phpt -crlf
|
||||
/ext/standard/tests/strings/vfprintf_variation12.phpt -crlf
|
||||
/ext/standard/tests/strings/vfprintf_variation16.phpt -crlf
|
||||
/ext/standard/tests/strings/vfprintf_variation18.phpt -crlf
|
||||
/ext/standard/tests/strings/vfprintf_variation4.phpt -crlf
|
||||
/ext/standard/tests/strings/vfprintf_variation6.phpt -crlf
|
||||
/ext/standard/tests/strings/vfprintf_variation7.phpt -crlf
|
||||
/ext/standard/tests/strings/vfprintf_variation8.phpt -crlf
|
||||
/ext/standard/tests/strings/vprintf_variation10.phpt -crlf
|
||||
/ext/standard/tests/strings/vprintf_variation12.phpt -crlf
|
||||
/ext/standard/tests/strings/vprintf_variation14.phpt -crlf
|
||||
/ext/standard/tests/strings/vprintf_variation18.phpt -crlf
|
||||
/ext/standard/tests/strings/vprintf_variation4.phpt -crlf
|
||||
/ext/standard/tests/strings/vprintf_variation6.phpt -crlf
|
||||
/ext/standard/tests/strings/vprintf_variation7.phpt -crlf
|
||||
/ext/standard/tests/strings/vprintf_variation8.phpt -crlf
|
||||
/ext/standard/tests/strings/vsprintf_variation10.phpt -crlf
|
||||
/ext/standard/tests/strings/vsprintf_variation12.phpt -crlf
|
||||
/ext/standard/tests/strings/vsprintf_variation14.phpt -crlf
|
||||
/ext/standard/tests/strings/vsprintf_variation16.phpt -crlf
|
||||
/ext/standard/tests/strings/vsprintf_variation4.phpt -crlf
|
||||
/ext/standard/tests/strings/vsprintf_variation6.phpt -crlf
|
||||
/ext/standard/tests/strings/vsprintf_variation7.phpt -crlf
|
||||
/ext/standard/tests/strings/vsprintf_variation8.phpt -crlf
|
||||
/ext/standard/tests/strings/wordwrap.phpt -crlf
|
||||
/ext/tidy/tests/010.phpt -crlf
|
||||
/ext/tidy/tests/012.phpt -crlf
|
||||
/ext/tidy/tests/025.phpt -crlf
|
||||
/ext/tidy/tests/030.phpt -crlf
|
||||
/ext/tokenizer/tests/bug26463.phpt -crlf
|
||||
/ext/tokenizer/tests/token_get_all_variation12.phpt -crlf
|
||||
/ext/tokenizer/tests/token_get_all_variation13.phpt -crlf
|
||||
/ext/tokenizer/tests/token_get_all_variation14.phpt -crlf
|
||||
/ext/tokenizer/tests/token_get_all_variation15.phpt -crlf
|
||||
/ext/tokenizer/tests/token_get_all_variation16.phpt -crlf
|
||||
/ext/tokenizer/tests/token_get_all_variation17.phpt -crlf
|
||||
/ext/tokenizer/tests/token_get_all_variation18.phpt -crlf
|
||||
/ext/tokenizer/tests/token_get_all_variation19.phpt -crlf
|
||||
/ext/tokenizer/tests/token_get_all_variation4.phpt -crlf
|
||||
/ext/tokenizer/tests/token_get_all_variation5.phpt -crlf
|
||||
/ext/tokenizer/tests/token_get_all_variation6.phpt -crlf
|
||||
/ext/tokenizer/tests/token_get_all_variation7.phpt -crlf
|
||||
/ext/tokenizer/tests/token_get_all_variation8.phpt -crlf
|
||||
/ext/tokenizer/tests/token_get_all_variation9.phpt -crlf
|
||||
/ext/xml/tests/bug26614_libxml.phpt -crlf
|
||||
/ext/xmlwriter/tests/004.phpt -crlf
|
||||
/ext/xmlwriter/tests/OO_004.phpt -crlf
|
||||
/ext/zlib/tests/005.phpt -crlf
|
||||
/ext/zlib/tests/gzfile_basic2.phpt -crlf
|
||||
/ext/zlib/tests/gzfile_basic.phpt -crlf
|
||||
/ext/zlib/tests/gzfilegzreadfile.phpt -crlf
|
||||
/ext/zlib/tests/readgzfile_basic2.phpt -crlf
|
||||
/ext/zlib/tests/readgzfile_basic.phpt -crlf
|
||||
/sapi/cli/tests/014.phpt -crlf
|
||||
/tests/run-test/test010.phpt -crlf
|
||||
/Zend/tests/bug35655.phpt -crlf
|
||||
/Zend/tests/bug48930.phpt -crlf
|
||||
/Zend/tests/bug61095.phpt -crlf
|
||||
/Zend/tests/heredoc_017.phpt -crlf
|
||||
/Zend/tests/heredoc_018.phpt -crlf
|
||||
/Zend/tests/nowdoc_013.phpt -crlf
|
||||
/Zend/tests/nowdoc_014.phpt -crlf
|
||||
/Zend/tests/nowdoc_015.phpt -crlf
|
||||
@@ -1,8 +1,75 @@
|
||||
PHP NEWS
|
||||
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
||||
?? ??? 2012, PHP 5.3.11
|
||||
14 Jun 2012, PHP 5.3.14
|
||||
|
||||
- CLI SAPI:
|
||||
. Fixed bug #61546 (functions related to current script failed when chdir()
|
||||
in cli sapi). (Laruence, reeze.xia@gmail.com)
|
||||
|
||||
- CURL:
|
||||
. Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction).
|
||||
(Laruence)
|
||||
|
||||
- COM:
|
||||
. Fixed bug #62146 com_dotnet cannot be built shared. (Johannes)
|
||||
|
||||
- Core:
|
||||
. Fixed CVE-2012-2143. (Solar Designer)
|
||||
. Fixed bug #62005 (unexpected behavior when incrementally assigning to a
|
||||
member of a null object). (Laruence)
|
||||
. Fixed bug #61730 (Segfault from array_walk modifying an array passed by
|
||||
reference). (Laruence)
|
||||
. Fixed missing bound check in iptcparse(). (chris at chiappa.net)
|
||||
. Fixed bug #61764 ('I' unpacks n as signed if n > 2^31-1 on LP64). (Gustavo)
|
||||
. Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename
|
||||
set to null). (Anatoliy)
|
||||
. Fixed bug #61713 (Logic error in charset detection for htmlentities).
|
||||
(Anatoliy)
|
||||
. Fixed bug #61991 (long overflow in realpath_cache_get()). (Anatoliy)
|
||||
. Changed php://fd to be available only for CLI.
|
||||
|
||||
- Fileinfo:
|
||||
. Fixed bug #61812 (Uninitialised value used in libmagic).
|
||||
(Laruence, Gustavo)
|
||||
|
||||
- Iconv extension:
|
||||
. Fixed a bug that iconv extension fails to link to the correct library
|
||||
when another extension makes use of a library that links to the iconv
|
||||
library. See https://bugs.gentoo.org/show_bug.cgi?id=364139 for detail.
|
||||
(Moriyoshi)
|
||||
|
||||
- Intl:
|
||||
. Fixed bug #62082 (Memory corruption in internal function
|
||||
get_icu_disp_value_src_php()). (Gustavo)
|
||||
|
||||
- JSON
|
||||
. Fixed bug #61537 (json_encode() incorrectly truncates/discards
|
||||
information). (Adam)
|
||||
|
||||
- PDO:
|
||||
. Fixed bug #61755 (A parsing bug in the prepared statements can lead to
|
||||
access violations). (Johannes)
|
||||
|
||||
- Phar:
|
||||
. Fix bug #61065 (Secunia SA44335). (Rasmus)
|
||||
|
||||
- Streams:
|
||||
. Fixed bug #61961 (file_get_contents leaks when access empty file with
|
||||
maxlen set). (Reeze)
|
||||
|
||||
08 May 2012, PHP 5.3.13
|
||||
- CGI
|
||||
. Improve fix for PHP-CGI query string parameter vulnerability, CVE-2012-2311.
|
||||
(Stas)
|
||||
|
||||
03 May 2012, PHP 5.3.12
|
||||
- Fix PHP-CGI query string parameter vulnerability, CVE-2012-1823. (Rasmus)
|
||||
|
||||
26 Apr 2012, PHP 5.3.11
|
||||
|
||||
- Core:
|
||||
. Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables
|
||||
(without apache2)). (Laruence)
|
||||
. Fixed bug #61273 (call_user_func_array with more than 16333 arguments
|
||||
leaks / crashes). (Laruence)
|
||||
. Fixed bug #61165 (Segfault - strip_tags()). (Laruence)
|
||||
@@ -49,6 +116,11 @@ PHP NEWS
|
||||
. Fixed bug #61172 (Add Apache 2.4 support). (Chris Jones)
|
||||
|
||||
- Fileinfo
|
||||
. Upgraded libmagic to 5.11 (Pierre, Anatoliy)
|
||||
. Fixed bug #61565 where php_stream_open_wrapper_ex tries to open a
|
||||
directory descriptor under windows. (Anatoliy)
|
||||
. Fixed bug #61566 failure caused by the posix lseek and read versions
|
||||
under windows in cdf_read(). (Anatoliy)
|
||||
. Fixed bug #61173 (Unable to detect error from finfo constructor). (Gustavo)
|
||||
|
||||
- Firebird Database extension (ibase):
|
||||
@@ -77,6 +149,10 @@ PHP NEWS
|
||||
- PDO_Sqlite extension:
|
||||
. Add createCollation support. (Damien)
|
||||
|
||||
- pgsql:
|
||||
. Fixed bug #60718 (Compile problem with libpq (PostgreSQL 7.3 or less).
|
||||
(Yasuo Ohgaki)
|
||||
|
||||
- Phar:
|
||||
. Fixed bug #61184 (Phar::webPhar() generates headers with trailing NUL
|
||||
bytes). (Nikic)
|
||||
|
||||
@@ -0,0 +1,124 @@
|
||||
====================
|
||||
Git Commit Rules
|
||||
====================
|
||||
|
||||
This is the first file you should be reading when contributing code via Git.
|
||||
We'll assume you're basically familiar with Git, but feel free to post
|
||||
your questions on the mailing list. Please have a look at
|
||||
http://git-scm.com/ for more detailed information on Git.
|
||||
|
||||
PHP is developed through the efforts of a large number of people.
|
||||
Collaboration is a Good Thing(tm), and Git lets us do this. Thus, following
|
||||
some basic rules with regards to Git usage will::
|
||||
|
||||
a. Make everybody happier, especially those responsible for maintaining
|
||||
Git itself.
|
||||
|
||||
b. Keep the changes consistently well documented and easily trackable.
|
||||
|
||||
c. Prevent some of those 'Oops' moments.
|
||||
|
||||
d. Increase the general level of good will on planet Earth.
|
||||
|
||||
Having said that, here are the organizational rules::
|
||||
|
||||
1. Respect other people working on the project.
|
||||
|
||||
2. Discuss any significant changes on the list before committing and get
|
||||
confirmation from the release manager for the given branch.
|
||||
|
||||
3. Look at EXTENSIONS file to see who is the primary maintainer of
|
||||
the code you want to contribute to.
|
||||
|
||||
4. If you "strongly disagree" about something another person did, don't
|
||||
start fighting publicly - take it up in private email.
|
||||
|
||||
5. If you don't know how to do something, ask first!
|
||||
|
||||
6. Test your changes before committing them. We mean it. Really.
|
||||
To do so use "make test".
|
||||
|
||||
7. For development use the --enable-maintainer-zts switch to ensure your
|
||||
code handles TSRM correctly and doesn't break for those who need that.
|
||||
|
||||
Currently we have the following branches in use::
|
||||
|
||||
master The active development branch.
|
||||
|
||||
PHP-5.4 Is used to release the PHP 5.4.x series. It still allows for
|
||||
larger enhancements.
|
||||
|
||||
PHP-5.3 Is used to release the PHP 5.3.x series. This is current
|
||||
stable version and is open for bugfixes only.
|
||||
|
||||
PHP-5.2 Is used to release the PHP 5.2.x series. It is closed for
|
||||
changes now.
|
||||
|
||||
PHP-5.1 This branch is closed.
|
||||
|
||||
PHP-4.4 This branch is closed.
|
||||
|
||||
The next few rules are more of a technical nature::
|
||||
|
||||
1. All changes should first go to the lowest branch (i.e. 5.3) and then
|
||||
get merged up to all other branches. If a change is not needed for
|
||||
later branches (i.e. fixes for features which where dropped from later
|
||||
branches) an empty merge should be done.
|
||||
|
||||
2. All news updates intended for public viewing, such as new features,
|
||||
bug fixes, improvements, etc., should go into the NEWS file of the
|
||||
*first* to be released version with the given change. In other words
|
||||
any NEWS file change only needs to done in one branch.
|
||||
|
||||
3. Do not commit multiple file and dump all messages in one commit. If you
|
||||
modified several unrelated files, commit each group separately and
|
||||
provide a nice commit message for each one. See example below.
|
||||
|
||||
4. Do write your commit message in such a way that it makes sense even
|
||||
without the corresponding diff. One should be able to look at it, and
|
||||
immediately know what was modified. Definitely include the function name
|
||||
in the message as shown below.
|
||||
|
||||
5. In your commit messages, keep each line shorter than 80 characters. And
|
||||
try to align your lines vertically, if they wrap. It looks bad otherwise.
|
||||
|
||||
6. If you modified a function that is callable from PHP, prepend PHP to
|
||||
the function name as shown below.
|
||||
|
||||
|
||||
The format of the commit messages is pretty simple.
|
||||
|
||||
<max 79 characters short description>\n
|
||||
\n
|
||||
<long description, 79 chars per line>
|
||||
\n
|
||||
|
||||
An Example from the git project (commit 2b34e486bc):
|
||||
|
||||
pack-objects: Fix compilation with NO_PTHREDS
|
||||
|
||||
It looks like commit 99fb6e04 (pack-objects: convert to use
|
||||
parse_options(), 2012-02-01) moved the #ifdef NO_PTHREDS around but
|
||||
hasn't noticed that the 'arg' variable no longer is available.
|
||||
|
||||
If you fix some bugs, you should note the bug ID numbers in your
|
||||
commit message. Bug ID should be prefixed by "#" for easier access to
|
||||
bug report when developers are browsing CVS via LXR or Bonsai.
|
||||
|
||||
Example::
|
||||
|
||||
Fixed bug #14016 (pgsql notice handler double free crash bug.)
|
||||
|
||||
When you change the NEWS file for a bug fix, then please keep the bugs
|
||||
sorted in decreasing order under the fixed version.
|
||||
|
||||
You can use OpenGrok (http://lxr.php.net/) and gitweb (http://git.php.net/)
|
||||
to look at PHP Git repository in various ways.
|
||||
|
||||
|
||||
For further information on the process and further details please refer to
|
||||
https://wiki.php.net/vcs/gitworkflow and https://wiki.php.net/vcs/gitfaq
|
||||
|
||||
Happy hacking,
|
||||
|
||||
PHP Team
|
||||
@@ -1,146 +0,0 @@
|
||||
====================
|
||||
SVN Commit Rules
|
||||
====================
|
||||
|
||||
This is the first file you should be reading after you get your SVN account.
|
||||
We'll assume you're basically familiar with SVN, but feel free to post
|
||||
your questions on the mailing list. Please have a look at
|
||||
http://svnbook.red-bean.com/ for more detailed information on SVN.
|
||||
|
||||
PHP is developed through the efforts of a large number of people.
|
||||
Collaboration is a Good Thing(tm), and SVN lets us do this. Thus, following
|
||||
some basic rules with regards to SVN usage will::
|
||||
|
||||
a. Make everybody happier, especially those responsible for maintaining
|
||||
the SVN itself.
|
||||
|
||||
b. Keep the changes consistently well documented and easily trackable.
|
||||
|
||||
c. Prevent some of those 'Oops' moments.
|
||||
|
||||
d. Increase the general level of good will on planet Earth.
|
||||
|
||||
Having said that, here are the organizational rules::
|
||||
|
||||
1. Respect other people working on the project.
|
||||
|
||||
2. Discuss any significant changes on the list before committing and get
|
||||
confirmation from the release manager for the given branch.
|
||||
|
||||
3. Look at EXTENSIONS file to see who is the primary maintainer of
|
||||
the code you want to contribute to.
|
||||
|
||||
4. If you "strongly disagree" about something another person did, don't
|
||||
start fighting publicly - take it up in private email.
|
||||
|
||||
5. If you don't know how to do something, ask first!
|
||||
|
||||
6. Test your changes before committing them. We mean it. Really.
|
||||
To do so use "make test".
|
||||
|
||||
7. For development use the --enable-maintainer-zts switch to ensure your
|
||||
code handles TSRM correctly and doesn't break for those who need that.
|
||||
|
||||
Currently we have the following branches in use::
|
||||
|
||||
trunk Will become PHP 6.0. This CVS branch is for active development.
|
||||
|
||||
branches/PHP_5_3 Is used to release the PHP 5.3.x series. It still allows for
|
||||
larger enhancements.
|
||||
|
||||
branches/PHP_5_2 Is used to release the PHP 5.2.x series. Only bugfixes are permitted
|
||||
on this branch (Consult the releasemaster prior to commit).
|
||||
|
||||
branches/PHP_5_1 This branch is closed.
|
||||
|
||||
branches/PHP_4_4 This branch is closed.
|
||||
|
||||
The next few rules are more of a technical nature::
|
||||
|
||||
1. All changes should first go to trunk and then get merged from trunk
|
||||
(aka MFH'ed) to all other relevant branches.
|
||||
|
||||
2. DO NOT TOUCH ChangeLog! It is automagically updated from the commit
|
||||
messages every day. Woe be to those who attempt to mess with it.
|
||||
|
||||
3. All news updates intended for public viewing, such as new features,
|
||||
bug fixes, improvements, etc., should go into the NEWS file of the
|
||||
*first* to be released version with the given change. In other words
|
||||
any NEWS file change only needs to done in one branch.
|
||||
|
||||
NB! Lines, starting with @ will go automagically into NEWS file, but
|
||||
this is NOT recommended, though. Please, add news entries directly to
|
||||
NEWS file and don't forget to keep them adjusted and sorted.
|
||||
|
||||
4. Do not commit multiple file and dump all messages in one commit. If you
|
||||
modified several unrelated files, commit each group separately and
|
||||
provide a nice commit message for each one. See example below.
|
||||
|
||||
5. Do write your commit message in such a way that it makes sense even
|
||||
without the corresponding diff. One should be able to look at it, and
|
||||
immediately know what was modified. Definitely include the function name
|
||||
in the message as shown below.
|
||||
|
||||
6. In your commit messages, keep each line shorter than 80 characters. And
|
||||
try to align your lines vertically, if they wrap. It looks bad otherwise.
|
||||
|
||||
7. If you modified a function that is callable from PHP, prepend PHP to
|
||||
the function name as shown below.
|
||||
|
||||
|
||||
The format of the commit messages is pretty simple.
|
||||
|
||||
Use a - to start a new item in your commit message.
|
||||
|
||||
If a line begins with #, it is taken to be a comment and will not appear
|
||||
in the ChangeLog. Everything else goes into the ChangeLog.
|
||||
|
||||
It is important to note that if your comment or news logline spans multiple
|
||||
lines, you have to put # at the beginning of **every** such line.
|
||||
|
||||
Example. Say you modified two files, datetime.c and string.c. In datetime.c you
|
||||
added a new format option for the date() function, and in string.c you fixed a
|
||||
memory leak in php_trim(). Don't commit both of these at once. Commit them
|
||||
separately and try to make sure your commit messages look something like the
|
||||
following.
|
||||
|
||||
For datetime.c::
|
||||
|
||||
- Added new 'K' format modifier to date() for printing out number of days
|
||||
until New Year's Eve.
|
||||
|
||||
For string.c::
|
||||
|
||||
- Fixed a memory leak in php_trim() resulting from improper use of zval_dtor().
|
||||
#- Man, that thing was leaking all over the place!
|
||||
|
||||
The # lines will be omitted from the ChangeLog automagically.
|
||||
|
||||
Use the [DOC] tag in your log message whenever you feel that your changes
|
||||
imply a documentation modification. The php-doc team will automatically
|
||||
get notified about your commit through the php-doc mailing list.
|
||||
|
||||
If you fix some bugs, you should note the bug ID numbers in your
|
||||
commit message. Bug ID should be prefixed by "#" for easier access to
|
||||
bug report when developers are browsing CVS via LXR or Bonsai.
|
||||
|
||||
Example::
|
||||
|
||||
Fixed bug #14016 (pgsql notice handler double free crash bug.)
|
||||
|
||||
If you don't see your messages in ChangeLog right away, don't worry!
|
||||
These files are updated once a day, so your stuff will not show up until
|
||||
somewhat later.
|
||||
|
||||
When you change the NEWS file for a bug fix, then please keep the bugs
|
||||
sorted in decreasing order under the fixed version.
|
||||
|
||||
You can use LXR (http://lxr.php.net/) and Bonsai (http://bonsai.php.net/)
|
||||
to look at PHP SVN repository in various ways.
|
||||
|
||||
To receive daily updates to ChangeLog and NEWS, send an empty message to
|
||||
php-cvs-daily-subscribe@lists.php.net.
|
||||
|
||||
Happy hacking,
|
||||
|
||||
PHP Team
|
||||
-112
@@ -1,112 +0,0 @@
|
||||
Using PHP 5 with the Zeus Web Server
|
||||
-----------------------------------
|
||||
|
||||
Zeus fully supports running PHP in combination with our
|
||||
webserver. There are three different interfaces that can be used to
|
||||
enable PHP:
|
||||
|
||||
* CGI
|
||||
* ISAPI
|
||||
* FastCGI
|
||||
|
||||
Of the three, we recommend using FastCGI, which has been tested and
|
||||
benchmarked as providing the best performance and reliability.
|
||||
|
||||
Full details of how to install PHP are available from our
|
||||
website, at:
|
||||
|
||||
http://support.zeus.com/products/php.html
|
||||
|
||||
If you have any problems, please check the support site for more
|
||||
up-to-date information and advice.
|
||||
|
||||
|
||||
Quick guide to installing CGI/FastCGI with Zeus
|
||||
-----------------------------------------------
|
||||
|
||||
Step 1 - Compile PHP as FastCGI.
|
||||
|
||||
Compile as follows:
|
||||
./configure --enable-fastcgi
|
||||
make
|
||||
|
||||
Note that PHP has many options to the configure script -
|
||||
e.g. --with-mysql. You will probably want to select your usual options
|
||||
before compiling; the above is just a bare minimum, for illustration.
|
||||
|
||||
After compilation finishes, you will be left with an executable
|
||||
program called 'php'. Copy this into your document root, under a
|
||||
dedicated FastCGI directory (e.g. $DOCROOT/fcgi-bin/php)
|
||||
|
||||
|
||||
Step 2 - configure Zeus
|
||||
|
||||
Four stages:
|
||||
- enable FastCGI
|
||||
- configure FastCGI
|
||||
- setup alias for FastCGI
|
||||
- setup alias for PHP
|
||||
|
||||
1) Using the admin server, go to the 'module configuration' page for
|
||||
your virtual server, and ensure that 'fastcgi' is enabled (select the
|
||||
tickbox to the left).
|
||||
|
||||
2) While we can run FastCGI's locally, there are known problems with
|
||||
some OS's (specifically, the communication between web server and
|
||||
FastCGI happens over a unix domain socket, and some OS's have trouble
|
||||
sustaining high connection rates over these sockets). So instead, we
|
||||
are going to set up the PHP FastCGI to run 'remotely' over localhost
|
||||
(this uses TCP sockets, which do not suffer this problem). Go to the
|
||||
'fastcgi configuration' page, and under 'add remote fastcgi':
|
||||
Add Remote FastCGI
|
||||
Docroot path /fcgi-bin/php
|
||||
Remote machine localhost:8002
|
||||
The first entry is where you saved PHP, above.
|
||||
The second entry is localhost:<any unused port>
|
||||
We will start the FastCGI listening on this port shortly.
|
||||
Click 'update' to commit these changes.
|
||||
|
||||
3) Go to the path mapping module and add an alias for FastCGI:
|
||||
Add Alias
|
||||
Docroot path /fcgi-bin
|
||||
Filesystem directory /path/to/docroot/fcgi-bin
|
||||
Alias type fastcgi
|
||||
Click 'update' to commit these changes
|
||||
|
||||
4) Also on the path mapping module, add a handler for PHP:
|
||||
Add handler
|
||||
File extension php
|
||||
Handler /fcgi-bin/php
|
||||
Click 'update' to commit these changes
|
||||
|
||||
Finally restart your virtual server for these changes to take effect.
|
||||
|
||||
|
||||
Step 3 - start PHP as a FastCGI runner
|
||||
|
||||
When you start PHP, it will pre-fork a given number of child processes
|
||||
to handle incoming PHP requests. Each process will handle a given
|
||||
number of requests before exiting (and being replaced by a newly
|
||||
forked process). You can control these two parameters by setting the
|
||||
following environment variables BEFORE starting the FastCGI runner:
|
||||
|
||||
PHP_FCGI_CHILDREN - the number of child processes to pre-fork. This
|
||||
variable MUST be set, if not then the PHP will not run as a FastCGI.
|
||||
We recommend a value of 8 for a fairly busy site. If you have many,
|
||||
long-running PHP scripts, then you may need to increase this further.
|
||||
|
||||
PHP_FCGI_MAX_REQUESTS - the number of requests each PHP child process
|
||||
handles before exiting. If not set, defaults to 500.
|
||||
|
||||
To start the FastCGI runner, execute '$ZEUSHOME/web/bin/fcgirunner
|
||||
8002 $DOCROOT/fcgi-bin/php'. Substitute the appropriate values for
|
||||
$ZEUSHOME and $DOCROOT; also substitute for 8002 the port you chose,
|
||||
above.
|
||||
|
||||
To stop the runner (e.g. to experiment with the above environment
|
||||
variables) you will need to manually stop and running PHP
|
||||
processes. (Use 'ps' and 'kill'). As it is PHP which is forking lots
|
||||
of children and not the runner, Zeus unfortunately cannot keep track
|
||||
of what processes are running, sorry. A typical command line may look
|
||||
like 'ps -efl | grep $DOCROOT/fcgi-bin/php | grep -v grep | awk
|
||||
'{print $4}' | xargs kill'
|
||||
@@ -0,0 +1,15 @@
|
||||
--TEST--
|
||||
Bug #62005 (unexpected behavior when incrementally assigning to a member of a null object)
|
||||
--FILE--
|
||||
<?php
|
||||
function add_points($player, $points) {
|
||||
$player->energy += $points;
|
||||
print_r($player);
|
||||
}
|
||||
add_points(NULL, 2);
|
||||
--EXPECTF--
|
||||
Strict Standards: Creating default object from empty value in %sbug62005.php on line %d
|
||||
stdClass Object
|
||||
(
|
||||
[energy] => 2
|
||||
)
|
||||
+1
-2
@@ -432,11 +432,10 @@ static inline void make_real_object(zval **object_ptr TSRMLS_DC)
|
||||
|| (Z_TYPE_PP(object_ptr) == IS_BOOL && Z_LVAL_PP(object_ptr) == 0)
|
||||
|| (Z_TYPE_PP(object_ptr) == IS_STRING && Z_STRLEN_PP(object_ptr) == 0)
|
||||
) {
|
||||
zend_error(E_STRICT, "Creating default object from empty value");
|
||||
|
||||
SEPARATE_ZVAL_IF_NOT_REF(object_ptr);
|
||||
zval_dtor(*object_ptr);
|
||||
object_init(*object_ptr);
|
||||
zend_error(E_STRICT, "Creating default object from empty value");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -127,7 +127,7 @@ ZEND_API zval *zend_user_it_new_iterator(zend_class_entry *ce, zval *object TSRM
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
/* {{{ zend_user_it_dtor */
|
||||
/* {{{ zend_user_it_invalidate_current */
|
||||
ZEND_API void zend_user_it_invalidate_current(zend_object_iterator *_iter TSRMLS_DC)
|
||||
{
|
||||
zend_user_iterator *iter = (zend_user_iterator*)_iter;
|
||||
|
||||
@@ -2438,7 +2438,12 @@ AC_DEFUN([PHP_SETUP_ICONV], [
|
||||
dnl
|
||||
dnl Check libc first if no path is provided in --with-iconv
|
||||
dnl
|
||||
|
||||
if test "$PHP_ICONV" = "yes"; then
|
||||
dnl Reset LIBS temporarily as it may have already been included
|
||||
dnl -liconv in.
|
||||
LIBS_save="$LIBS"
|
||||
LIBS=
|
||||
AC_CHECK_FUNC(iconv, [
|
||||
found_iconv=yes
|
||||
],[
|
||||
@@ -2448,6 +2453,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [
|
||||
found_iconv=yes
|
||||
])
|
||||
])
|
||||
LIBS="$LIBS_save"
|
||||
fi
|
||||
|
||||
dnl
|
||||
|
||||
+3
-3
@@ -31,7 +31,7 @@ dnl Basic autoconf + automake initialization, generation of config.nice.
|
||||
dnl -------------------------------------------------------------------------
|
||||
|
||||
AC_PREREQ(2.13)
|
||||
AC_INIT(README.SVN-RULES)
|
||||
AC_INIT(README.GIT-RULES)
|
||||
|
||||
PHP_CONFIG_NICE(config.nice)
|
||||
|
||||
@@ -41,8 +41,8 @@ AC_CONFIG_HEADER(main/php_config.h)
|
||||
|
||||
PHP_MAJOR_VERSION=5
|
||||
PHP_MINOR_VERSION=3
|
||||
PHP_RELEASE_VERSION=11
|
||||
PHP_EXTRA_VERSION="-dev"
|
||||
PHP_RELEASE_VERSION=14
|
||||
PHP_EXTRA_VERSION=""
|
||||
PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
|
||||
PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`
|
||||
|
||||
|
||||
@@ -2,9 +2,34 @@
|
||||
unixtojd()
|
||||
--SKIPIF--
|
||||
<?php include 'skipif.inc'; ?>
|
||||
--ENV--
|
||||
TZ=UTC
|
||||
--FILE--
|
||||
<?php
|
||||
// this line has no impact on test output on Windows
|
||||
putenv('TZ=UTC');
|
||||
// getenv('TZ') returns 'UTC' here
|
||||
// putenv (basic_functions.c) does call tzset() when the env var being put is 'TZ'
|
||||
// -adding a call direct to GetEnvironmentVariableA just before tzset() is called to check the value of 'TZ' returns 'UTC'
|
||||
// putting a call to date_default_timezone_set() here doesn't help
|
||||
//
|
||||
// on Windows, the only thing that gets this test to pass is to put TZ=UTC in --ENV-- section
|
||||
// -since putenv() is written to call tzset() when env var is TZ, I assume that putenv("TZ=UTC") is intended to work
|
||||
// and should work on all platforms(including Windows).
|
||||
// easter_date.phpt passes
|
||||
// -doesn't use --ENV-- section
|
||||
// -uses --INI-- section with date.timezone=UTC
|
||||
// -uses putenv('TZ=UTC')
|
||||
// date.timezone=UTC
|
||||
// -if ommitted from easter_date.phpt, outputs DATE_TZ_ERRMSG warning
|
||||
// -easter_date() calls mktime() and localtime()
|
||||
// -whereas unixtojd(1000000000) calls localtime(1000000000)
|
||||
// -if ommitted from unixtojd.phpt, does NOT output DATE_TZ_ERRMSG
|
||||
//
|
||||
// unixtojd() calls php_localtime_r() which for Pacific timezone systems, returns a time -8 hours
|
||||
// -this incorrect localtime is passed to the julian date conversion (GregorianToSDN) function which works (probably correctly)
|
||||
// but returns -1 day from expected because its input is -1 from expected
|
||||
|
||||
echo unixtojd(40000). "\n";
|
||||
echo unixtojd(1000000000). "\n";
|
||||
echo unixtojd(1152459009). "\n";
|
||||
|
||||
@@ -42,7 +42,7 @@ void php_com_throw_exception(HRESULT code, char *message TSRMLS_DC)
|
||||
}
|
||||
}
|
||||
|
||||
PHPAPI void php_com_wrap_dispatch(zval *z, IDispatch *disp,
|
||||
PHP_COM_DOTNET_API void php_com_wrap_dispatch(zval *z, IDispatch *disp,
|
||||
int codepage TSRMLS_DC)
|
||||
{
|
||||
php_com_dotnet_object *obj;
|
||||
@@ -65,7 +65,7 @@ PHPAPI void php_com_wrap_dispatch(zval *z, IDispatch *disp,
|
||||
z->value.obj.handlers = &php_com_object_handlers;
|
||||
}
|
||||
|
||||
PHPAPI void php_com_wrap_variant(zval *z, VARIANT *v,
|
||||
PHP_COM_DOTNET_API void php_com_wrap_variant(zval *z, VARIANT *v,
|
||||
int codepage TSRMLS_DC)
|
||||
{
|
||||
php_com_dotnet_object *obj;
|
||||
@@ -92,7 +92,7 @@ PHPAPI void php_com_wrap_variant(zval *z, VARIANT *v,
|
||||
|
||||
/* this is a convenience function for fetching a particular
|
||||
* element from a (possibly multi-dimensional) safe array */
|
||||
PHPAPI int php_com_safearray_get_elem(VARIANT *array, VARIANT *dest, LONG dim1 TSRMLS_DC)
|
||||
PHP_COM_DOTNET_API int php_com_safearray_get_elem(VARIANT *array, VARIANT *dest, LONG dim1 TSRMLS_DC)
|
||||
{
|
||||
UINT dims;
|
||||
LONG lbound, ubound;
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
#include "php_com_dotnet_internal.h"
|
||||
|
||||
|
||||
PHPAPI OLECHAR *php_com_string_to_olestring(char *string, uint string_len, int codepage TSRMLS_DC)
|
||||
PHP_COM_DOTNET_API OLECHAR *php_com_string_to_olestring(char *string, uint string_len, int codepage TSRMLS_DC)
|
||||
{
|
||||
OLECHAR *olestring = NULL;
|
||||
DWORD flags = codepage == CP_UTF8 ? 0 : MB_PRECOMPOSED | MB_ERR_INVALID_CHARS;
|
||||
@@ -65,7 +65,7 @@ PHPAPI OLECHAR *php_com_string_to_olestring(char *string, uint string_len, int c
|
||||
return olestring;
|
||||
}
|
||||
|
||||
PHPAPI char *php_com_olestring_to_string(OLECHAR *olestring, uint *string_len, int codepage TSRMLS_DC)
|
||||
PHP_COM_DOTNET_API char *php_com_olestring_to_string(OLECHAR *olestring, uint *string_len, int codepage TSRMLS_DC)
|
||||
{
|
||||
char *string;
|
||||
uint length = 0;
|
||||
|
||||
@@ -271,7 +271,7 @@ static void istream_destructor(php_istream *stm)
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
PHPAPI IStream *php_com_wrapper_export_stream(php_stream *stream TSRMLS_DC)
|
||||
PHP_COM_DOTNET_API IStream *php_com_wrapper_export_stream(php_stream *stream TSRMLS_DC)
|
||||
{
|
||||
php_istream *stm = (php_istream*)CoTaskMemAlloc(sizeof(*stm));
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
* b) a CLSID, major, minor e.g. "{00000200-0000-0010-8000-00AA006D2EA4},2,0"
|
||||
* c) a Type Library name e.g. "Microsoft OLE DB ActiveX Data Objects 1.0 Library"
|
||||
*/
|
||||
PHPAPI ITypeLib *php_com_load_typelib(char *search_string, int codepage TSRMLS_DC)
|
||||
PHP_COM_DOTNET_API ITypeLib *php_com_load_typelib(char *search_string, int codepage TSRMLS_DC)
|
||||
{
|
||||
ITypeLib *TL = NULL;
|
||||
char *strtok_buf, *major, *minor;
|
||||
@@ -153,7 +153,7 @@ PHPAPI ITypeLib *php_com_load_typelib(char *search_string, int codepage TSRMLS_D
|
||||
}
|
||||
|
||||
/* Given a type-library, merge it into the current engine state */
|
||||
PHPAPI int php_com_import_typelib(ITypeLib *TL, int mode, int codepage TSRMLS_DC)
|
||||
PHP_COM_DOTNET_API int php_com_import_typelib(ITypeLib *TL, int mode, int codepage TSRMLS_DC)
|
||||
{
|
||||
int i, j, interfaces;
|
||||
TYPEKIND pTKind;
|
||||
@@ -224,7 +224,7 @@ void php_com_typelibrary_dtor(void *pDest)
|
||||
ITypeLib_Release(*Lib);
|
||||
}
|
||||
|
||||
PHPAPI ITypeLib *php_com_load_typelib_via_cache(char *search_string,
|
||||
PHP_COM_DOTNET_API ITypeLib *php_com_load_typelib_via_cache(char *search_string,
|
||||
int codepage, int *cached TSRMLS_DC)
|
||||
{
|
||||
ITypeLib **TLp;
|
||||
|
||||
@@ -98,7 +98,7 @@ bogus:
|
||||
}
|
||||
}
|
||||
|
||||
PHPAPI void php_com_variant_from_zval(VARIANT *v, zval *z, int codepage TSRMLS_DC)
|
||||
PHP_COM_DOTNET_API void php_com_variant_from_zval(VARIANT *v, zval *z, int codepage TSRMLS_DC)
|
||||
{
|
||||
OLECHAR *olestring;
|
||||
php_com_dotnet_object *obj;
|
||||
@@ -166,7 +166,7 @@ PHPAPI void php_com_variant_from_zval(VARIANT *v, zval *z, int codepage TSRMLS_D
|
||||
}
|
||||
}
|
||||
|
||||
PHPAPI int php_com_zval_from_variant(zval *z, VARIANT *v, int codepage TSRMLS_DC)
|
||||
PHP_COM_DOTNET_API int php_com_zval_from_variant(zval *z, VARIANT *v, int codepage TSRMLS_DC)
|
||||
{
|
||||
OLECHAR *olestring = NULL;
|
||||
int ret = SUCCESS;
|
||||
@@ -258,7 +258,7 @@ PHPAPI int php_com_zval_from_variant(zval *z, VARIANT *v, int codepage TSRMLS_DC
|
||||
}
|
||||
|
||||
|
||||
PHPAPI int php_com_copy_variant(VARIANT *dstvar, VARIANT *srcvar TSRMLS_DC)
|
||||
PHP_COM_DOTNET_API int php_com_copy_variant(VARIANT *dstvar, VARIANT *srcvar TSRMLS_DC)
|
||||
{
|
||||
int ret = SUCCESS;
|
||||
|
||||
|
||||
@@ -586,7 +586,7 @@ static void disp_destructor(php_dispatchex *disp)
|
||||
CoTaskMemFree(disp);
|
||||
}
|
||||
|
||||
PHPAPI IDispatch *php_com_wrapper_export_as_sink(zval *val, GUID *sinkid,
|
||||
PHP_COM_DOTNET_API IDispatch *php_com_wrapper_export_as_sink(zval *val, GUID *sinkid,
|
||||
HashTable *id_to_name TSRMLS_DC)
|
||||
{
|
||||
php_dispatchex *disp = disp_constructor(val TSRMLS_CC);
|
||||
@@ -625,7 +625,7 @@ PHPAPI IDispatch *php_com_wrapper_export_as_sink(zval *val, GUID *sinkid,
|
||||
return (IDispatch*)disp;
|
||||
}
|
||||
|
||||
PHPAPI IDispatch *php_com_wrapper_export(zval *val TSRMLS_DC)
|
||||
PHP_COM_DOTNET_API IDispatch *php_com_wrapper_export(zval *val TSRMLS_DC)
|
||||
{
|
||||
php_dispatchex *disp = NULL;
|
||||
|
||||
|
||||
@@ -28,6 +28,14 @@ extern zend_module_entry com_dotnet_module_entry;
|
||||
#include "TSRM.h"
|
||||
#endif
|
||||
|
||||
#ifdef PHP_WIN32
|
||||
# define PHP_COM_DOTNET_API __declspec(dllexport)
|
||||
#elif defined(__GNUC__) && __GNUC__ >= 4
|
||||
# define PHP_COM_DOTNET_API __attribute__ ((visibility("default")))
|
||||
#else
|
||||
# define PHP_COM_DOTNET_API
|
||||
#endif
|
||||
|
||||
PHP_MINIT_FUNCTION(com_dotnet);
|
||||
PHP_MSHUTDOWN_FUNCTION(com_dotnet);
|
||||
PHP_RINIT_FUNCTION(com_dotnet);
|
||||
|
||||
@@ -87,9 +87,9 @@ zend_object_iterator *php_com_saproxy_iter_get(zend_class_entry *ce, zval *objec
|
||||
int php_com_saproxy_create(zval *com_object, zval *proxy_out, zval *index TSRMLS_DC);
|
||||
|
||||
/* com_olechar.c */
|
||||
PHPAPI char *php_com_olestring_to_string(OLECHAR *olestring,
|
||||
PHP_COM_DOTNET_API char *php_com_olestring_to_string(OLECHAR *olestring,
|
||||
uint *string_len, int codepage TSRMLS_DC);
|
||||
PHPAPI OLECHAR *php_com_string_to_olestring(char *string,
|
||||
PHP_COM_DOTNET_API OLECHAR *php_com_string_to_olestring(char *string,
|
||||
uint string_len, int codepage TSRMLS_DC);
|
||||
|
||||
|
||||
@@ -115,8 +115,8 @@ int php_com_do_invoke_byref(php_com_dotnet_object *obj, char *name, int namelen,
|
||||
|
||||
/* com_wrapper.c */
|
||||
int php_com_wrapper_minit(INIT_FUNC_ARGS);
|
||||
PHPAPI IDispatch *php_com_wrapper_export_as_sink(zval *val, GUID *sinkid, HashTable *id_to_name TSRMLS_DC);
|
||||
PHPAPI IDispatch *php_com_wrapper_export(zval *val TSRMLS_DC);
|
||||
PHP_COM_DOTNET_API IDispatch *php_com_wrapper_export_as_sink(zval *val, GUID *sinkid, HashTable *id_to_name TSRMLS_DC);
|
||||
PHP_COM_DOTNET_API IDispatch *php_com_wrapper_export(zval *val TSRMLS_DC);
|
||||
|
||||
/* com_persist.c */
|
||||
int php_com_persist_minit(INIT_FUNC_ARGS);
|
||||
@@ -150,10 +150,10 @@ PHP_FUNCTION(variant_get_type);
|
||||
PHP_FUNCTION(variant_set_type);
|
||||
PHP_FUNCTION(variant_cast);
|
||||
|
||||
PHPAPI void php_com_variant_from_zval_with_type(VARIANT *v, zval *z, VARTYPE type, int codepage TSRMLS_DC);
|
||||
PHPAPI void php_com_variant_from_zval(VARIANT *v, zval *z, int codepage TSRMLS_DC);
|
||||
PHPAPI int php_com_zval_from_variant(zval *z, VARIANT *v, int codepage TSRMLS_DC);
|
||||
PHPAPI int php_com_copy_variant(VARIANT *dst, VARIANT *src TSRMLS_DC);
|
||||
PHP_COM_DOTNET_API void php_com_variant_from_zval_with_type(VARIANT *v, zval *z, VARTYPE type, int codepage TSRMLS_DC);
|
||||
PHP_COM_DOTNET_API void php_com_variant_from_zval(VARIANT *v, zval *z, int codepage TSRMLS_DC);
|
||||
PHP_COM_DOTNET_API int php_com_zval_from_variant(zval *z, VARIANT *v, int codepage TSRMLS_DC);
|
||||
PHP_COM_DOTNET_API int php_com_copy_variant(VARIANT *dst, VARIANT *src TSRMLS_DC);
|
||||
|
||||
/* com_dotnet.c */
|
||||
PHP_FUNCTION(com_dotnet_create_instance);
|
||||
@@ -162,17 +162,17 @@ void php_com_dotnet_mshutdown(TSRMLS_D);
|
||||
|
||||
/* com_misc.c */
|
||||
void php_com_throw_exception(HRESULT code, char *message TSRMLS_DC);
|
||||
PHPAPI void php_com_wrap_dispatch(zval *z, IDispatch *disp,
|
||||
PHP_COM_DOTNET_API void php_com_wrap_dispatch(zval *z, IDispatch *disp,
|
||||
int codepage TSRMLS_DC);
|
||||
PHPAPI void php_com_wrap_variant(zval *z, VARIANT *v,
|
||||
PHP_COM_DOTNET_API void php_com_wrap_variant(zval *z, VARIANT *v,
|
||||
int codepage TSRMLS_DC);
|
||||
PHPAPI int php_com_safearray_get_elem(VARIANT *array, VARIANT *dest, LONG dim1 TSRMLS_DC);
|
||||
PHP_COM_DOTNET_API int php_com_safearray_get_elem(VARIANT *array, VARIANT *dest, LONG dim1 TSRMLS_DC);
|
||||
|
||||
/* com_typeinfo.c */
|
||||
PHPAPI ITypeLib *php_com_load_typelib_via_cache(char *search_string,
|
||||
PHP_COM_DOTNET_API ITypeLib *php_com_load_typelib_via_cache(char *search_string,
|
||||
int codepage, int *cached TSRMLS_DC);
|
||||
PHPAPI ITypeLib *php_com_load_typelib(char *search_string, int codepage TSRMLS_DC);
|
||||
PHPAPI int php_com_import_typelib(ITypeLib *TL, int mode,
|
||||
PHP_COM_DOTNET_API ITypeLib *php_com_load_typelib(char *search_string, int codepage TSRMLS_DC);
|
||||
PHP_COM_DOTNET_API int php_com_import_typelib(ITypeLib *TL, int mode,
|
||||
int codepage TSRMLS_DC);
|
||||
void php_com_typelibrary_dtor(void *pDest);
|
||||
ITypeInfo *php_com_locate_typeinfo(char *typelibname, php_com_dotnet_object *obj, char *dispname, int sink TSRMLS_DC);
|
||||
|
||||
@@ -3,9 +3,23 @@ Bug #49192 (PHP crashes when GC invoked on COM object)
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; ?>
|
||||
--XFAIL--
|
||||
1
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
// this test fails to load ADO
|
||||
//
|
||||
// a change in windows longhorn x64(affecting vista, 7, 8, 2008, 2008r2) broke ADO.
|
||||
//
|
||||
// there is a fix available, but user has to install it.
|
||||
// given that ADO was deprecated a long time ago in favor of newer APIs,
|
||||
// I don't think its worth the trouble of making the user install the fix to
|
||||
// get an accurate test run. its better to just not run the test or expect it to fail.
|
||||
//
|
||||
// see: http://support.microsoft.com/kb/2517589
|
||||
// see: http://www.infoq.com/news/2011/10/ADO-Win7
|
||||
|
||||
$dbConnection = new Com('ADODB.Connection');
|
||||
var_dump(gc_collect_cycles());
|
||||
?>
|
||||
|
||||
@@ -2167,7 +2167,7 @@ string_copy:
|
||||
|
||||
convert_to_string_ex(zvalue);
|
||||
|
||||
if (php_check_open_basedir(Z_STRVAL_PP(zvalue) TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(Z_STRVAL_PP(zvalue), "rb+", CHECKUID_CHECK_MODE_PARAM))) {
|
||||
if (!Z_STRLEN_PP(zvalue) || php_check_open_basedir(Z_STRVAL_PP(zvalue) TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(Z_STRVAL_PP(zvalue), "rb+", CHECKUID_CHECK_MODE_PARAM))) {
|
||||
RETVAL_FALSE;
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
--TEST--
|
||||
Bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)
|
||||
--SKIPIF--
|
||||
<?php if (!extension_loaded("curl")) print "skip"; ?>
|
||||
--INI--
|
||||
open_basedir="/tmp"
|
||||
--FILE--
|
||||
<?php
|
||||
$ch = curl_init();
|
||||
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, ""));
|
||||
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "/tmp/foo"));
|
||||
var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "/xxx/bar"));
|
||||
curl_close($ch);
|
||||
?>
|
||||
--EXPECTF--
|
||||
bool(false)
|
||||
bool(true)
|
||||
|
||||
Warning: curl_setopt(): open_basedir restriction in effect. File(/xxx/bar) is not within the allowed path(s): (/tmp) in %sbug61948.php on line %d
|
||||
bool(false)
|
||||
+635
-616
File diff suppressed because it is too large.
Load diff
@@ -11,6 +11,7 @@ date.timezone=UTC
|
||||
$d = new DateTime('@100000000000');
|
||||
var_dump($d->format('Y-m-d H:i:s U'));
|
||||
var_dump($d->getTimestamp());
|
||||
var_dump($d->format('U'));
|
||||
|
||||
$d->setTimestamp(100000000000);
|
||||
var_dump($d->format('Y-m-d H:i:s U'));
|
||||
@@ -21,7 +22,8 @@ var_dump($i->format('%s'));
|
||||
?>
|
||||
--EXPECT--
|
||||
string(32) "5138-11-16 09:46:40 100000000000"
|
||||
int(100000000000)
|
||||
string(32) "5138-11-16 09:46:40 100000000000"
|
||||
int(100000000000)
|
||||
bool(false)
|
||||
string(12) "100000000000"
|
||||
string(30) "2008-07-11 04:56:32 1215752192"
|
||||
int(1215752192)
|
||||
string(10) "1215752192"
|
||||
@@ -0,0 +1,24 @@
|
||||
--TEST--
|
||||
date_default_timezone_get() function [1]
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if(substr(PHP_OS, 0, 3) != 'WIN') die("skip skip on non windows");
|
||||
?>
|
||||
--INI--
|
||||
date.timezone=
|
||||
--FILE--
|
||||
<?php
|
||||
putenv('TZ=');
|
||||
echo date_default_timezone_get(), "\n";
|
||||
echo date('e'), "\n";
|
||||
/* The behaviour on windows is to select an arbitrary timezone name from the current system settings.
|
||||
This gives no chance to hardcode the timezone name, for instance for UTC+1 it could choose
|
||||
from the multiple names like Europe/Berlin or Europe/Paris . For this reason the test is
|
||||
parametrized so there is no hardcoded timezone data.*/
|
||||
?>
|
||||
--EXPECTF--
|
||||
Warning: date_default_timezone_get(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected '%s' for '%s' instead in %sdate_default_timezone_get-1-win32.php on line 3
|
||||
%s
|
||||
|
||||
Warning: date(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected '%s' for '%s' instead in %sdate_default_timezone_get-1-win32.php on line 4
|
||||
%s
|
||||
@@ -1,5 +1,9 @@
|
||||
--TEST--
|
||||
date_default_timezone_get() function [1]
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if(substr(PHP_OS, 0, 3) == 'WIN') die("skip on windows");
|
||||
?>
|
||||
--INI--
|
||||
date.timezone=
|
||||
--FILE--
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
--TEST--
|
||||
date_default_timezone_get() function [2]
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if(substr(PHP_OS, 0, 3) != 'WIN') die("skip on non windows");
|
||||
?>
|
||||
--INI--
|
||||
date.timezone=
|
||||
--FILE--
|
||||
<?php
|
||||
putenv('TZ=');
|
||||
echo date_default_timezone_get(), "\n";
|
||||
/* The behaviour on windows is to select an arbitrary timezone name from the current system settings.
|
||||
This gives no chance to hardcode the timezone name, for instance for UTC+1 it could choose
|
||||
from the multiple names like Europe/Berlin or Europe/Paris . For this reason the test is
|
||||
parametrized so there is no hardcoded timezone data.*/
|
||||
?>
|
||||
--EXPECTF--
|
||||
Warning: date_default_timezone_get(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected '%s' for '%s' instead in %sdate_default_timezone_get-2-win32.php on line 3
|
||||
%s
|
||||
@@ -1,5 +1,9 @@
|
||||
--TEST--
|
||||
date_default_timezone_get() function [2]
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if(substr(PHP_OS, 0, 3) == 'WIN') die("skip on windows");
|
||||
?>
|
||||
--INI--
|
||||
date.timezone=
|
||||
--FILE--
|
||||
|
||||
@@ -12,7 +12,7 @@ require_once('skipif.inc');
|
||||
|
||||
require_once('dom_test.inc');
|
||||
|
||||
chdir(__DIR__ . "/../examples");
|
||||
chdir(__DIR__);
|
||||
$XMLStringGood = file_get_contents('note.xml');
|
||||
|
||||
$dom = new DOMDocument;
|
||||
|
||||
@@ -63,12 +63,24 @@ echo "\n";
|
||||
$ents = $dtd->entities;
|
||||
$length = $ents->length;
|
||||
echo "Length: ".$length."\n";
|
||||
|
||||
$xkeys = array();
|
||||
foreach ($ents AS $key=>$node) {
|
||||
echo "Key: $key Name: ".$node->nodeName."\n";
|
||||
$xkeys[] = "Key: $key Name: ".$node->nodeName."\n";
|
||||
}
|
||||
sort($xkeys); // fix inconsistent output ordering (bug #61810)
|
||||
foreach ($xkeys as $key => $node) {
|
||||
echo $node;
|
||||
}
|
||||
echo "\n";
|
||||
|
||||
$xkeys = array();
|
||||
for($x=0; $x < $length; $x++) {
|
||||
echo "Index $x: ".$ents->item($x)->nodeName."\n";
|
||||
$xkeys[] = "Index: ".$ents->item($x)->nodeName."\n";
|
||||
}
|
||||
sort($xkeys); // fix inconsistent output ordering (bug #61810)
|
||||
foreach ($xkeys as $key => $node) {
|
||||
echo $node;
|
||||
}
|
||||
|
||||
echo "\n";
|
||||
@@ -87,13 +99,13 @@ Index 0: GIF (image/gif) (-)
|
||||
NULL
|
||||
|
||||
Length: 3
|
||||
Key: test Name: test
|
||||
Key: rdf Name: rdf
|
||||
Key: myimage Name: myimage
|
||||
Key: rdf Name: rdf
|
||||
Key: test Name: test
|
||||
|
||||
Index 0: test
|
||||
Index 1: rdf
|
||||
Index 2: myimage
|
||||
Index: myimage
|
||||
Index: rdf
|
||||
Index: test
|
||||
|
||||
NULL
|
||||
NULL
|
||||
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<!ELEMENT note (to,from,heading,body)>
|
||||
<!ELEMENT to (#PCDATA)>
|
||||
<!ELEMENT from (#PCDATA)>
|
||||
<!ELEMENT heading (#PCDATA)>
|
||||
<!ELEMENT body (#PCDATA)>
|
||||
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0"?>
|
||||
<!DOCTYPE note SYSTEM "note.dtd">
|
||||
<note>
|
||||
<to>PHP User Group</to>
|
||||
<from>Shane</from>
|
||||
<heading>Reminder</heading>
|
||||
<body>Don't forget the meeting tonight!</body>
|
||||
</note>
|
||||
+13
-2
@@ -515,11 +515,22 @@ static void _php_finfo_get_type(INTERNAL_FUNCTION_PARAMETERS, int mode, int mime
|
||||
wrap = php_stream_locate_url_wrapper(buffer, &tmp2, 0 TSRMLS_CC);
|
||||
|
||||
if (wrap) {
|
||||
php_stream *stream;
|
||||
php_stream_context *context = php_stream_context_from_zval(zcontext, 0);
|
||||
|
||||
#ifdef PHP_WIN32
|
||||
if (php_stream_stat_path_ex(buffer, 0, &ssb, context) == SUCCESS) {
|
||||
if (ssb.sb.st_mode & S_IFDIR) {
|
||||
ret_val = mime_directory;
|
||||
goto common;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
#if PHP_API_VERSION < 20100412
|
||||
php_stream *stream = php_stream_open_wrapper_ex(buffer, "rb", ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL, context);
|
||||
stream = php_stream_open_wrapper_ex(buffer, "rb", ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL, context);
|
||||
#else
|
||||
php_stream *stream = php_stream_open_wrapper_ex(buffer, "rb", REPORT_ERRORS, NULL, context);
|
||||
stream = php_stream_open_wrapper_ex(buffer, "rb", REPORT_ERRORS, NULL, context);
|
||||
#endif
|
||||
|
||||
if (!stream) {
|
||||
|
||||
+194
-55
@@ -1,6 +1,6 @@
|
||||
diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
|
||||
--- libmagic.orig/apprentice.c 2012-03-28 12:00:34.017709605 +0200
|
||||
+++ libmagic/apprentice.c 2012-03-28 01:53:04.283305402 +0200
|
||||
--- libmagic.orig/apprentice.c 2012-04-22 19:30:43.182305355 +0800
|
||||
+++ libmagic/apprentice.c 2012-04-22 19:28:57.346309536 +0800
|
||||
@@ -29,6 +29,8 @@
|
||||
* apprentice - make one pass through /etc/magic, learning its secrets.
|
||||
*/
|
||||
@@ -729,8 +729,8 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
|
||||
m->str_flags = swap4(m->str_flags);
|
||||
}
|
||||
diff -u libmagic.orig/ascmagic.c libmagic/ascmagic.c
|
||||
--- libmagic.orig/ascmagic.c 2012-03-28 12:00:34.017709605 +0200
|
||||
+++ libmagic/ascmagic.c 2012-03-28 01:53:04.287303117 +0200
|
||||
--- libmagic.orig/ascmagic.c 2012-04-22 19:30:43.182305355 +0800
|
||||
+++ libmagic/ascmagic.c 2012-04-22 19:28:57.330309533 +0800
|
||||
@@ -139,10 +139,8 @@
|
||||
/* malloc size is a conservative overestimate; could be
|
||||
improved, or at least realloced after conversion. */
|
||||
@@ -754,10 +754,9 @@ diff -u libmagic.orig/ascmagic.c libmagic/ascmagic.c
|
||||
|
||||
return rv;
|
||||
}
|
||||
Only in libmagic.orig: asprintf.c
|
||||
diff -u libmagic.orig/cdf.c libmagic/cdf.c
|
||||
--- libmagic.orig/cdf.c 2012-03-28 12:00:34.012709598 +0200
|
||||
+++ libmagic/cdf.c 2012-03-28 01:53:04.299331601 +0200
|
||||
--- libmagic.orig/cdf.c 2012-04-22 19:30:43.182305355 +0800
|
||||
+++ libmagic/cdf.c 2012-04-22 19:28:57.370309531 +0800
|
||||
@@ -43,7 +43,17 @@
|
||||
#include <err.h>
|
||||
#endif
|
||||
@@ -776,6 +775,19 @@ diff -u libmagic.orig/cdf.c libmagic/cdf.c
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
#include <ctype.h>
|
||||
@@ -296,10 +306,10 @@
|
||||
if (info->i_fd == -1)
|
||||
return -1;
|
||||
|
||||
- if (lseek(info->i_fd, off, SEEK_SET) == (off_t)-1)
|
||||
+ if (FINFO_LSEEK_FUNC(info->i_fd, off, SEEK_SET) == (off_t)-1)
|
||||
return -1;
|
||||
|
||||
- if (read(info->i_fd, buf, len) != (ssize_t)len)
|
||||
+ if (FINFO_READ_FUNC(info->i_fd, buf, len) != (ssize_t)len)
|
||||
return -1;
|
||||
|
||||
return (ssize_t)len;
|
||||
@@ -1135,7 +1145,7 @@
|
||||
cdf_directory_t *d;
|
||||
char name[__arraycount(d->d_name)];
|
||||
@@ -807,8 +819,8 @@ diff -u libmagic.orig/cdf.c libmagic/cdf.c
|
||||
(void)fprintf(stderr, "timestamp %s\n", buf);
|
||||
} else {
|
||||
diff -u libmagic.orig/cdf.h libmagic/cdf.h
|
||||
--- libmagic.orig/cdf.h 2012-03-28 12:00:34.017709605 +0200
|
||||
+++ libmagic/cdf.h 2012-03-28 01:53:04.299331601 +0200
|
||||
--- libmagic.orig/cdf.h 2012-04-22 19:30:43.182305355 +0800
|
||||
+++ libmagic/cdf.h 2012-04-22 19:28:57.370309531 +0800
|
||||
@@ -35,7 +35,7 @@
|
||||
#ifndef _H_CDF_
|
||||
#define _H_CDF_
|
||||
@@ -845,8 +857,8 @@ diff -u libmagic.orig/cdf.h libmagic/cdf.h
|
||||
void cdf_swap_header(cdf_header_t *);
|
||||
void cdf_unpack_header(cdf_header_t *, char *);
|
||||
diff -u libmagic.orig/cdf_time.c libmagic/cdf_time.c
|
||||
--- libmagic.orig/cdf_time.c 2012-03-28 12:00:34.017709605 +0200
|
||||
+++ libmagic/cdf_time.c 2012-03-28 01:53:04.299331601 +0200
|
||||
--- libmagic.orig/cdf_time.c 2012-04-22 19:30:43.182305355 +0800
|
||||
+++ libmagic/cdf_time.c 2012-04-22 19:28:57.326309537 +0800
|
||||
@@ -96,7 +96,7 @@
|
||||
}
|
||||
|
||||
@@ -904,8 +916,8 @@ diff -u libmagic.orig/cdf_time.c libmagic/cdf_time.c
|
||||
static const char *ref = "Sat Apr 23 01:30:00 1977";
|
||||
char *p, *q;
|
||||
diff -u libmagic.orig/compress.c libmagic/compress.c
|
||||
--- libmagic.orig/compress.c 2012-03-28 12:00:34.012709598 +0200
|
||||
+++ libmagic/compress.c 2012-03-28 01:53:04.299331601 +0200
|
||||
--- libmagic.orig/compress.c 2012-04-22 19:30:43.182305355 +0800
|
||||
+++ libmagic/compress.c 2012-04-22 19:28:57.314309548 +0800
|
||||
@@ -32,6 +32,7 @@
|
||||
* uncompress(method, old, n, newch) - uncompress old into new,
|
||||
* using method, return sizeof new
|
||||
@@ -990,7 +1002,23 @@ diff -u libmagic.orig/compress.c libmagic/compress.c
|
||||
for (cnt = 0;; cnt++) {
|
||||
fd_set check;
|
||||
struct timeval tout = {0, 100 * 1000};
|
||||
@@ -301,7 +307,8 @@
|
||||
@@ -218,7 +224,7 @@
|
||||
|
||||
nocheck:
|
||||
do
|
||||
- switch ((rv = read(fd, buf, n))) {
|
||||
+ switch ((rv = FINFO_READ_FUNC(fd, buf, n))) {
|
||||
case -1:
|
||||
if (errno == EINTR)
|
||||
continue;
|
||||
@@ -295,13 +301,14 @@
|
||||
return -1;
|
||||
}
|
||||
(void)close(tfd);
|
||||
- if (lseek(fd, (off_t)0, SEEK_SET) == (off_t)-1) {
|
||||
+ if (FINFO_LSEEK_FUNC(fd, (off_t)0, SEEK_SET) == (off_t)-1) {
|
||||
file_badseek(ms);
|
||||
return -1;
|
||||
}
|
||||
return fd;
|
||||
}
|
||||
@@ -1011,6 +1039,15 @@ diff -u libmagic.orig/compress.c libmagic/compress.c
|
||||
|
||||
/* XXX: const castaway, via strchr */
|
||||
z.next_in = (Bytef *)strchr((const char *)old + data_start,
|
||||
@@ -400,7 +405,7 @@
|
||||
(void) close(0);
|
||||
if (fd != -1) {
|
||||
(void) dup(fd);
|
||||
- (void) lseek(0, (off_t)0, SEEK_SET);
|
||||
+ (void) FINFO_LSEEK_FUNC(0, (off_t)0, SEEK_SET);
|
||||
} else {
|
||||
(void) dup(fdin[0]);
|
||||
(void) close(fdin[0]);
|
||||
@@ -465,20 +470,14 @@
|
||||
fdin[1] = -1;
|
||||
}
|
||||
@@ -1041,11 +1078,9 @@ diff -u libmagic.orig/compress.c libmagic/compress.c
|
||||
}
|
||||
-#endif
|
||||
+#endif /* if PHP_FILEINFO_UNCOMPRESS */
|
||||
Only in libmagic: config.h
|
||||
Only in libmagic.orig: file.c
|
||||
diff -u libmagic.orig/file.h libmagic/file.h
|
||||
--- libmagic.orig/file.h 2012-03-28 12:00:34.017709605 +0200
|
||||
+++ libmagic/file.h 2012-03-28 01:53:04.304322598 +0200
|
||||
--- libmagic.orig/file.h 2012-04-22 19:30:43.186305188 +0800
|
||||
+++ libmagic/file.h 2012-04-22 19:49:58.922256776 +0800
|
||||
@@ -33,11 +33,9 @@
|
||||
#ifndef __file_h__
|
||||
#define __file_h__
|
||||
@@ -1165,7 +1200,13 @@ diff -u libmagic.orig/file.h libmagic/file.h
|
||||
protected void file_showstr(FILE *, const char *, size_t);
|
||||
protected size_t file_mbswidth(const char *);
|
||||
protected const char *file_getbuffer(struct magic_set *);
|
||||
@@ -443,11 +439,8 @@
|
||||
@@ -438,16 +434,14 @@
|
||||
size_t *);
|
||||
protected size_t file_pstring_length_size(const struct magic *);
|
||||
protected size_t file_pstring_get_length(const struct magic *, const char *);
|
||||
+protected size_t file_printedlen(const struct magic_set *ms);
|
||||
#ifdef __EMX__
|
||||
protected int file_os2_apptype(struct magic_set *, const char *, const void *,
|
||||
size_t);
|
||||
#endif /* __EMX__ */
|
||||
|
||||
@@ -1177,7 +1218,7 @@ diff -u libmagic.orig/file.h libmagic/file.h
|
||||
|
||||
#ifndef HAVE_STRERROR
|
||||
extern int sys_nerr;
|
||||
@@ -460,17 +453,10 @@
|
||||
@@ -460,17 +454,10 @@
|
||||
#define strtoul(a, b, c) strtol(a, b, c)
|
||||
#endif
|
||||
|
||||
@@ -1197,10 +1238,22 @@ diff -u libmagic.orig/file.h libmagic/file.h
|
||||
size_t strlcat(char *dst, const char *src, size_t siz);
|
||||
#endif
|
||||
#ifndef HAVE_GETLINE
|
||||
Only in libmagic.orig: file_opts.h
|
||||
@@ -500,4 +487,12 @@
|
||||
#define FILE_RCSID(id)
|
||||
#endif
|
||||
|
||||
+#ifdef PHP_WIN32
|
||||
+#define FINFO_LSEEK_FUNC _lseek
|
||||
+#define FINFO_READ_FUNC _read
|
||||
+#else
|
||||
+#define FINFO_LSEEK_FUNC lseek
|
||||
+#define FINFO_READ_FUNC read
|
||||
+#endif
|
||||
+
|
||||
#endif /* __file_h__ */
|
||||
diff -u libmagic.orig/fsmagic.c libmagic/fsmagic.c
|
||||
--- libmagic.orig/fsmagic.c 2012-03-28 12:00:34.012709598 +0200
|
||||
+++ libmagic/fsmagic.c 2012-03-28 01:53:04.304322598 +0200
|
||||
--- libmagic.orig/fsmagic.c 2012-04-22 19:30:43.186305188 +0800
|
||||
+++ libmagic/fsmagic.c 2012-04-22 19:28:57.298309521 +0800
|
||||
@@ -59,27 +59,21 @@
|
||||
# define minor(dev) ((dev) & 0xff)
|
||||
#endif
|
||||
@@ -1411,10 +1464,10 @@ diff -u libmagic.orig/fsmagic.c libmagic/fsmagic.c
|
||||
-#else
|
||||
- if (file_printf(ms, "block special") == -1)
|
||||
- return -1;
|
||||
-#endif
|
||||
#endif
|
||||
- }
|
||||
- return 1;
|
||||
#endif
|
||||
-#endif
|
||||
- /* TODO add code to handle V7 MUX and Blit MUX files */
|
||||
+
|
||||
#ifdef S_IFIFO
|
||||
@@ -1524,8 +1577,8 @@ diff -u libmagic.orig/fsmagic.c libmagic/fsmagic.c
|
||||
|
||||
/*
|
||||
diff -u libmagic.orig/funcs.c libmagic/funcs.c
|
||||
--- libmagic.orig/funcs.c 2012-03-28 12:00:34.012709598 +0200
|
||||
+++ libmagic/funcs.c 2012-03-28 11:49:56.089607390 +0200
|
||||
--- libmagic.orig/funcs.c 2012-04-22 19:30:43.186305188 +0800
|
||||
+++ libmagic/funcs.c 2012-04-22 19:28:57.370309531 +0800
|
||||
@@ -41,52 +41,42 @@
|
||||
#if defined(HAVE_WCTYPE_H)
|
||||
#include <wctype.h>
|
||||
@@ -1763,7 +1816,7 @@ diff -u libmagic.orig/funcs.c libmagic/funcs.c
|
||||
+ pcre_cache_entry *pce;
|
||||
+ char *res;
|
||||
+ zval *repl;
|
||||
+ int res_len, rep_cnt;
|
||||
+ int res_len, rep_cnt = 0;
|
||||
+ TSRMLS_FETCH();
|
||||
+
|
||||
+ MAKE_STD_ZVAL(patt);
|
||||
@@ -1819,12 +1872,11 @@ diff -u libmagic.orig/funcs.c libmagic/funcs.c
|
||||
+ return rep_cnt;
|
||||
}
|
||||
+
|
||||
Only in libmagic.orig: getline.c
|
||||
Only in libmagic.orig: getopt_long.c
|
||||
Only in libmagic: LICENSE
|
||||
Only in libmagic.orig: funcs.c.orig
|
||||
Only in libmagic.orig: funcs.c.rej
|
||||
diff -u libmagic.orig/magic.c libmagic/magic.c
|
||||
--- libmagic.orig/magic.c 2012-03-28 12:00:34.012709598 +0200
|
||||
+++ libmagic/magic.c 2012-03-28 11:42:50.404750579 +0200
|
||||
--- libmagic.orig/magic.c 2012-04-22 19:30:43.186305188 +0800
|
||||
+++ libmagic/magic.c 2012-04-22 19:28:57.370309531 +0800
|
||||
@@ -25,11 +25,6 @@
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
@@ -2201,8 +2253,8 @@ diff -u libmagic.orig/magic.c libmagic/magic.c
|
||||
public const char *
|
||||
magic_error(struct magic_set *ms)
|
||||
diff -u libmagic.orig/magic.h libmagic/magic.h
|
||||
--- libmagic.orig/magic.h 2012-03-28 12:00:34.017709605 +0200
|
||||
+++ libmagic/magic.h 2012-03-28 01:53:04.304322598 +0200
|
||||
--- libmagic.orig/magic.h 2012-04-22 19:30:43.190305058 +0800
|
||||
+++ libmagic/magic.h 2012-04-22 19:28:57.326309537 +0800
|
||||
@@ -85,6 +85,7 @@
|
||||
|
||||
const char *magic_getpath(const char *, int);
|
||||
@@ -2219,14 +2271,9 @@ diff -u libmagic.orig/magic.h libmagic/magic.h
|
||||
int magic_list(magic_t, const char *);
|
||||
int magic_errno(magic_t);
|
||||
|
||||
Only in libmagic.orig: Makefile.am
|
||||
Only in libmagic.orig: Makefile.in
|
||||
Only in libmagic.orig: mygetopt.h
|
||||
Only in libmagic: names.h
|
||||
Only in libmagic: patchlevel.h
|
||||
diff -u libmagic.orig/print.c libmagic/print.c
|
||||
--- libmagic.orig/print.c 2012-03-28 12:00:34.017709605 +0200
|
||||
+++ libmagic/print.c 2012-03-28 01:53:04.304322598 +0200
|
||||
--- libmagic.orig/print.c 2012-04-22 19:30:43.190305058 +0800
|
||||
+++ libmagic/print.c 2012-04-22 19:28:57.326309537 +0800
|
||||
@@ -29,6 +29,9 @@
|
||||
* print.c - debugging printout routines
|
||||
*/
|
||||
@@ -2420,8 +2467,8 @@ diff -u libmagic.orig/print.c libmagic/print.c
|
||||
|
||||
protected const char *
|
||||
diff -u libmagic.orig/readcdf.c libmagic/readcdf.c
|
||||
--- libmagic.orig/readcdf.c 2012-03-28 12:00:34.012709598 +0200
|
||||
+++ libmagic/readcdf.c 2012-03-28 01:53:04.304322598 +0200
|
||||
--- libmagic.orig/readcdf.c 2012-04-22 19:30:43.190305058 +0800
|
||||
+++ libmagic/readcdf.c 2012-04-22 19:28:57.326309537 +0800
|
||||
@@ -30,7 +30,11 @@
|
||||
#endif
|
||||
|
||||
@@ -2468,8 +2515,8 @@ diff -u libmagic.orig/readcdf.c libmagic/readcdf.c
|
||||
if ((ec = strchr(c, '\n')) != NULL)
|
||||
*ec = '\0';
|
||||
diff -u libmagic.orig/readelf.c libmagic/readelf.c
|
||||
--- libmagic.orig/readelf.c 2012-03-28 12:00:34.017709605 +0200
|
||||
+++ libmagic/readelf.c 2012-03-28 01:53:04.308322618 +0200
|
||||
--- libmagic.orig/readelf.c 2012-04-22 19:30:43.190305058 +0800
|
||||
+++ libmagic/readelf.c 2012-04-22 19:28:57.378309534 +0800
|
||||
@@ -49,7 +49,7 @@
|
||||
off_t, int *, int);
|
||||
private int doshn(struct magic_set *, int, int, int, off_t, int, size_t,
|
||||
@@ -2479,6 +2526,34 @@ diff -u libmagic.orig/readelf.c libmagic/readelf.c
|
||||
int, size_t, int *);
|
||||
|
||||
#define ELF_ALIGN(a) ((((a) + align - 1) / align) * align)
|
||||
@@ -309,11 +309,11 @@
|
||||
* Loop through all the program headers.
|
||||
*/
|
||||
for ( ; num; num--) {
|
||||
- if (lseek(fd, off, SEEK_SET) == (off_t)-1) {
|
||||
+ if (FINFO_LSEEK_FUNC(fd, off, SEEK_SET) == (off_t)-1) {
|
||||
file_badseek(ms);
|
||||
return -1;
|
||||
}
|
||||
- if (read(fd, xph_addr, xph_sizeof) == -1) {
|
||||
+ if (FINFO_READ_FUNC(fd, xph_addr, xph_sizeof) == -1) {
|
||||
file_badread(ms);
|
||||
return -1;
|
||||
}
|
||||
@@ -331,11 +331,11 @@
|
||||
* This is a PT_NOTE section; loop through all the notes
|
||||
* in the section.
|
||||
*/
|
||||
- if (lseek(fd, xph_offset, SEEK_SET) == (off_t)-1) {
|
||||
+ if (FINFO_LSEEK_FUNC(fd, xph_offset, SEEK_SET) == (off_t)-1) {
|
||||
file_badseek(ms);
|
||||
return -1;
|
||||
}
|
||||
- bufsize = read(fd, nbuf,
|
||||
+ bufsize = FINFO_READ_FUNC(fd, nbuf,
|
||||
((xph_filesz < sizeof(nbuf)) ? xph_filesz : sizeof(nbuf)));
|
||||
if (bufsize == -1) {
|
||||
file_badread(ms);
|
||||
@@ -357,7 +357,7 @@
|
||||
#endif
|
||||
|
||||
@@ -2496,6 +2571,20 @@ diff -u libmagic.orig/readelf.c libmagic/readelf.c
|
||||
|
||||
(void)memcpy(xnh_addr, &nbuf[offset], xnh_sizeof);
|
||||
offset += xnh_sizeof;
|
||||
@@ -859,11 +858,11 @@
|
||||
}
|
||||
|
||||
for ( ; num; num--) {
|
||||
- if (lseek(fd, off, SEEK_SET) == (off_t)-1) {
|
||||
+ if (FINFO_LSEEK_FUNC(fd, off, SEEK_SET) == (off_t)-1) {
|
||||
file_badseek(ms);
|
||||
return -1;
|
||||
}
|
||||
- if (read(fd, xsh_addr, xsh_sizeof) == -1) {
|
||||
+ if (FINFO_READ_FUNC(fd, xsh_addr, xsh_sizeof) == -1) {
|
||||
file_badread(ms);
|
||||
return -1;
|
||||
}
|
||||
@@ -888,20 +887,16 @@
|
||||
/* Things we can determine when we seek */
|
||||
switch (xsh_type) {
|
||||
@@ -2505,22 +2594,24 @@ diff -u libmagic.orig/readelf.c libmagic/readelf.c
|
||||
- " for note");
|
||||
- return -1;
|
||||
- }
|
||||
- if ((noff = lseek(fd, (off_t)xsh_offset, SEEK_SET)) ==
|
||||
+ nbuf = emalloc((size_t)xsh_size);
|
||||
if ((noff = lseek(fd, (off_t)xsh_offset, SEEK_SET)) ==
|
||||
+ if ((noff = FINFO_LSEEK_FUNC(fd, (off_t)xsh_offset, SEEK_SET)) ==
|
||||
(off_t)-1) {
|
||||
file_badread(ms);
|
||||
- free(nbuf);
|
||||
+ efree(nbuf);
|
||||
return -1;
|
||||
}
|
||||
if (read(fd, nbuf, (size_t)xsh_size) !=
|
||||
- if (read(fd, nbuf, (size_t)xsh_size) !=
|
||||
+ if (FINFO_READ_FUNC(fd, nbuf, (size_t)xsh_size) !=
|
||||
(ssize_t)xsh_size) {
|
||||
- free(nbuf);
|
||||
+ efree(nbuf);
|
||||
file_badread(ms);
|
||||
return -1;
|
||||
}
|
||||
@@ -916,7 +911,7 @@
|
||||
@@ -916,10 +911,10 @@
|
||||
if (noff == 0)
|
||||
break;
|
||||
}
|
||||
@@ -2528,10 +2619,61 @@ diff -u libmagic.orig/readelf.c libmagic/readelf.c
|
||||
+ efree(nbuf);
|
||||
break;
|
||||
case SHT_SUNW_cap:
|
||||
if (lseek(fd, (off_t)xsh_offset, SEEK_SET) ==
|
||||
- if (lseek(fd, (off_t)xsh_offset, SEEK_SET) ==
|
||||
+ if (FINFO_LSEEK_FUNC(fd, (off_t)xsh_offset, SEEK_SET) ==
|
||||
(off_t)-1) {
|
||||
file_badseek(ms);
|
||||
return -1;
|
||||
@@ -932,7 +927,7 @@
|
||||
MAX(sizeof cap32, sizeof cap64)];
|
||||
if ((coff += xcap_sizeof) > (off_t)xsh_size)
|
||||
break;
|
||||
- if (read(fd, cbuf, (size_t)xcap_sizeof) !=
|
||||
+ if (FINFO_READ_FUNC(fd, cbuf, (size_t)xcap_sizeof) !=
|
||||
(ssize_t)xcap_sizeof) {
|
||||
file_badread(ms);
|
||||
return -1;
|
||||
@@ -1051,12 +1046,12 @@
|
||||
}
|
||||
|
||||
for ( ; num; num--) {
|
||||
- if (lseek(fd, off, SEEK_SET) == (off_t)-1) {
|
||||
+ if (FINFO_LSEEK_FUNC(fd, off, SEEK_SET) == (off_t)-1) {
|
||||
file_badseek(ms);
|
||||
return -1;
|
||||
}
|
||||
|
||||
- if (read(fd, xph_addr, xph_sizeof) == -1) {
|
||||
+ if (FINFO_READ_FUNC(fd, xph_addr, xph_sizeof) == -1) {
|
||||
file_badread(ms);
|
||||
return -1;
|
||||
}
|
||||
@@ -1095,11 +1090,11 @@
|
||||
* This is a PT_NOTE section; loop through all the notes
|
||||
* in the section.
|
||||
*/
|
||||
- if (lseek(fd, xph_offset, SEEK_SET) == (off_t)-1) {
|
||||
+ if (FINFO_LSEEK_FUNC(fd, xph_offset, SEEK_SET) == (off_t)-1) {
|
||||
file_badseek(ms);
|
||||
return -1;
|
||||
}
|
||||
- bufsize = read(fd, nbuf, ((xph_filesz < sizeof(nbuf)) ?
|
||||
+ bufsize = FINFO_READ_FUNC(fd, nbuf, ((xph_filesz < sizeof(nbuf)) ?
|
||||
xph_filesz : sizeof(nbuf)));
|
||||
if (bufsize == -1) {
|
||||
file_badread(ms);
|
||||
@@ -1161,7 +1156,7 @@
|
||||
/*
|
||||
* If we cannot seek, it must be a pipe, socket or fifo.
|
||||
*/
|
||||
- if((lseek(fd, (off_t)0, SEEK_SET) == (off_t)-1) && (errno == ESPIPE))
|
||||
+ if((FINFO_LSEEK_FUNC(fd, (off_t)0, SEEK_SET) == (off_t)-1) && (errno == ESPIPE))
|
||||
fd = file_pipe2file(ms, fd, buf, nbytes);
|
||||
|
||||
if (fstat(fd, &st) == -1) {
|
||||
diff -u libmagic.orig/softmagic.c libmagic/softmagic.c
|
||||
--- libmagic.orig/softmagic.c 2012-03-28 12:00:34.012709598 +0200
|
||||
+++ libmagic/softmagic.c 2012-03-28 01:53:04.308322618 +0200
|
||||
--- libmagic.orig/softmagic.c 2012-04-22 19:30:43.194304945 +0800
|
||||
+++ libmagic/softmagic.c 2012-04-22 19:28:57.286309597 +0800
|
||||
@@ -41,6 +41,11 @@
|
||||
#include <stdlib.h>
|
||||
#include <time.h>
|
||||
@@ -2999,6 +3141,3 @@ diff -u libmagic.orig/softmagic.c libmagic/softmagic.c
|
||||
default:
|
||||
file_magerror(ms, "invalid type %d in magiccheck()", m->type);
|
||||
return -1;
|
||||
Only in libmagic.orig: strlcat.c
|
||||
Only in libmagic.orig: strlcpy.c
|
||||
Only in libmagic.orig: vasprintf.c
|
||||
@@ -306,10 +306,10 @@ cdf_read(const cdf_info_t *info, off_t off, void *buf, size_t len)
|
||||
if (info->i_fd == -1)
|
||||
return -1;
|
||||
|
||||
if (lseek(info->i_fd, off, SEEK_SET) == (off_t)-1)
|
||||
if (FINFO_LSEEK_FUNC(info->i_fd, off, SEEK_SET) == (off_t)-1)
|
||||
return -1;
|
||||
|
||||
if (read(info->i_fd, buf, len) != (ssize_t)len)
|
||||
if (FINFO_READ_FUNC(info->i_fd, buf, len) != (ssize_t)len)
|
||||
return -1;
|
||||
|
||||
return (ssize_t)len;
|
||||
|
||||
@@ -224,7 +224,7 @@ sread(int fd, void *buf, size_t n, int canbepipe)
|
||||
|
||||
nocheck:
|
||||
do
|
||||
switch ((rv = read(fd, buf, n))) {
|
||||
switch ((rv = FINFO_READ_FUNC(fd, buf, n))) {
|
||||
case -1:
|
||||
if (errno == EINTR)
|
||||
continue;
|
||||
@@ -301,7 +301,7 @@ file_pipe2file(struct magic_set *ms, int fd, const void *startbuf,
|
||||
return -1;
|
||||
}
|
||||
(void)close(tfd);
|
||||
if (lseek(fd, (off_t)0, SEEK_SET) == (off_t)-1) {
|
||||
if (FINFO_LSEEK_FUNC(fd, (off_t)0, SEEK_SET) == (off_t)-1) {
|
||||
file_badseek(ms);
|
||||
return -1;
|
||||
}
|
||||
@@ -405,7 +405,7 @@ uncompressbuf(struct magic_set *ms, int fd, size_t method,
|
||||
(void) close(0);
|
||||
if (fd != -1) {
|
||||
(void) dup(fd);
|
||||
(void) lseek(0, (off_t)0, SEEK_SET);
|
||||
(void) FINFO_LSEEK_FUNC(0, (off_t)0, SEEK_SET);
|
||||
} else {
|
||||
(void) dup(fdin[0]);
|
||||
(void) close(fdin[0]);
|
||||
|
||||
@@ -434,6 +434,7 @@ protected int file_looks_utf8(const unsigned char *, size_t, unichar *,
|
||||
size_t *);
|
||||
protected size_t file_pstring_length_size(const struct magic *);
|
||||
protected size_t file_pstring_get_length(const struct magic *, const char *);
|
||||
protected size_t file_printedlen(const struct magic_set *ms);
|
||||
#ifdef __EMX__
|
||||
protected int file_os2_apptype(struct magic_set *, const char *, const void *,
|
||||
size_t);
|
||||
@@ -486,4 +487,12 @@ static const char *rcsid(const char *p) { \
|
||||
#define FILE_RCSID(id)
|
||||
#endif
|
||||
|
||||
#ifdef PHP_WIN32
|
||||
#define FINFO_LSEEK_FUNC _lseek
|
||||
#define FINFO_READ_FUNC _read
|
||||
#else
|
||||
#define FINFO_LSEEK_FUNC lseek
|
||||
#define FINFO_READ_FUNC read
|
||||
#endif
|
||||
|
||||
#endif /* __file_h__ */
|
||||
@@ -438,7 +438,7 @@ file_replace(struct magic_set *ms, const char *pat, const char *rep)
|
||||
pcre_cache_entry *pce;
|
||||
char *res;
|
||||
zval *repl;
|
||||
int res_len, rep_cnt;
|
||||
int res_len, rep_cnt = 0;
|
||||
TSRMLS_FETCH();
|
||||
|
||||
MAKE_STD_ZVAL(patt);
|
||||
|
||||
@@ -309,11 +309,11 @@ dophn_core(struct magic_set *ms, int clazz, int swap, int fd, off_t off,
|
||||
* Loop through all the program headers.
|
||||
*/
|
||||
for ( ; num; num--) {
|
||||
if (lseek(fd, off, SEEK_SET) == (off_t)-1) {
|
||||
if (FINFO_LSEEK_FUNC(fd, off, SEEK_SET) == (off_t)-1) {
|
||||
file_badseek(ms);
|
||||
return -1;
|
||||
}
|
||||
if (read(fd, xph_addr, xph_sizeof) == -1) {
|
||||
if (FINFO_READ_FUNC(fd, xph_addr, xph_sizeof) == -1) {
|
||||
file_badread(ms);
|
||||
return -1;
|
||||
}
|
||||
@@ -331,11 +331,11 @@ dophn_core(struct magic_set *ms, int clazz, int swap, int fd, off_t off,
|
||||
* This is a PT_NOTE section; loop through all the notes
|
||||
* in the section.
|
||||
*/
|
||||
if (lseek(fd, xph_offset, SEEK_SET) == (off_t)-1) {
|
||||
if (FINFO_LSEEK_FUNC(fd, xph_offset, SEEK_SET) == (off_t)-1) {
|
||||
file_badseek(ms);
|
||||
return -1;
|
||||
}
|
||||
bufsize = read(fd, nbuf,
|
||||
bufsize = FINFO_READ_FUNC(fd, nbuf,
|
||||
((xph_filesz < sizeof(nbuf)) ? xph_filesz : sizeof(nbuf)));
|
||||
if (bufsize == -1) {
|
||||
file_badread(ms);
|
||||
@@ -858,11 +858,11 @@ doshn(struct magic_set *ms, int clazz, int swap, int fd, off_t off, int num,
|
||||
}
|
||||
|
||||
for ( ; num; num--) {
|
||||
if (lseek(fd, off, SEEK_SET) == (off_t)-1) {
|
||||
if (FINFO_LSEEK_FUNC(fd, off, SEEK_SET) == (off_t)-1) {
|
||||
file_badseek(ms);
|
||||
return -1;
|
||||
}
|
||||
if (read(fd, xsh_addr, xsh_sizeof) == -1) {
|
||||
if (FINFO_READ_FUNC(fd, xsh_addr, xsh_sizeof) == -1) {
|
||||
file_badread(ms);
|
||||
return -1;
|
||||
}
|
||||
@@ -888,13 +888,13 @@ doshn(struct magic_set *ms, int clazz, int swap, int fd, off_t off, int num,
|
||||
switch (xsh_type) {
|
||||
case SHT_NOTE:
|
||||
nbuf = emalloc((size_t)xsh_size);
|
||||
if ((noff = lseek(fd, (off_t)xsh_offset, SEEK_SET)) ==
|
||||
if ((noff = FINFO_LSEEK_FUNC(fd, (off_t)xsh_offset, SEEK_SET)) ==
|
||||
(off_t)-1) {
|
||||
file_badread(ms);
|
||||
efree(nbuf);
|
||||
return -1;
|
||||
}
|
||||
if (read(fd, nbuf, (size_t)xsh_size) !=
|
||||
if (FINFO_READ_FUNC(fd, nbuf, (size_t)xsh_size) !=
|
||||
(ssize_t)xsh_size) {
|
||||
efree(nbuf);
|
||||
file_badread(ms);
|
||||
@@ -914,7 +914,7 @@ doshn(struct magic_set *ms, int clazz, int swap, int fd, off_t off, int num,
|
||||
efree(nbuf);
|
||||
break;
|
||||
case SHT_SUNW_cap:
|
||||
if (lseek(fd, (off_t)xsh_offset, SEEK_SET) ==
|
||||
if (FINFO_LSEEK_FUNC(fd, (off_t)xsh_offset, SEEK_SET) ==
|
||||
(off_t)-1) {
|
||||
file_badseek(ms);
|
||||
return -1;
|
||||
@@ -927,7 +927,7 @@ doshn(struct magic_set *ms, int clazz, int swap, int fd, off_t off, int num,
|
||||
MAX(sizeof cap32, sizeof cap64)];
|
||||
if ((coff += xcap_sizeof) > (off_t)xsh_size)
|
||||
break;
|
||||
if (read(fd, cbuf, (size_t)xcap_sizeof) !=
|
||||
if (FINFO_READ_FUNC(fd, cbuf, (size_t)xcap_sizeof) !=
|
||||
(ssize_t)xcap_sizeof) {
|
||||
file_badread(ms);
|
||||
return -1;
|
||||
@@ -1046,12 +1046,12 @@ dophn_exec(struct magic_set *ms, int clazz, int swap, int fd, off_t off,
|
||||
}
|
||||
|
||||
for ( ; num; num--) {
|
||||
if (lseek(fd, off, SEEK_SET) == (off_t)-1) {
|
||||
if (FINFO_LSEEK_FUNC(fd, off, SEEK_SET) == (off_t)-1) {
|
||||
file_badseek(ms);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (read(fd, xph_addr, xph_sizeof) == -1) {
|
||||
if (FINFO_READ_FUNC(fd, xph_addr, xph_sizeof) == -1) {
|
||||
file_badread(ms);
|
||||
return -1;
|
||||
}
|
||||
@@ -1090,11 +1090,11 @@ dophn_exec(struct magic_set *ms, int clazz, int swap, int fd, off_t off,
|
||||
* This is a PT_NOTE section; loop through all the notes
|
||||
* in the section.
|
||||
*/
|
||||
if (lseek(fd, xph_offset, SEEK_SET) == (off_t)-1) {
|
||||
if (FINFO_LSEEK_FUNC(fd, xph_offset, SEEK_SET) == (off_t)-1) {
|
||||
file_badseek(ms);
|
||||
return -1;
|
||||
}
|
||||
bufsize = read(fd, nbuf, ((xph_filesz < sizeof(nbuf)) ?
|
||||
bufsize = FINFO_READ_FUNC(fd, nbuf, ((xph_filesz < sizeof(nbuf)) ?
|
||||
xph_filesz : sizeof(nbuf)));
|
||||
if (bufsize == -1) {
|
||||
file_badread(ms);
|
||||
@@ -1156,7 +1156,7 @@ file_tryelf(struct magic_set *ms, int fd, const unsigned char *buf,
|
||||
/*
|
||||
* If we cannot seek, it must be a pipe, socket or fifo.
|
||||
*/
|
||||
if((lseek(fd, (off_t)0, SEEK_SET) == (off_t)-1) && (errno == ESPIPE))
|
||||
if((FINFO_LSEEK_FUNC(fd, (off_t)0, SEEK_SET) == (off_t)-1) && (errno == ESPIPE))
|
||||
fd = file_pipe2file(ms, fd, buf, nbytes);
|
||||
|
||||
if (fstat(fd, &st) == -1) {
|
||||
|
||||
@@ -1,7 +1,13 @@
|
||||
--TEST--
|
||||
Bug #52209 (INPUT_ENV returns NULL for set variables (CLI))
|
||||
--SKIPIF--
|
||||
<?php if (!extension_loaded("filter") || !empty($_ENV['PWD'])) die("skip"); ?>
|
||||
<?php
|
||||
/* This test makes no sense on windows as an empty variable
|
||||
would never show up in the "set" list. Which means, it's
|
||||
always undefined in PHP. */
|
||||
if(substr(PHP_OS, 0, 3) == "WIN") die("skip Not for Windows");
|
||||
if (!extension_loaded("filter") || !empty($_ENV['PWD'])) die("skip");
|
||||
?>
|
||||
--INI--
|
||||
variables_order=GPCSE
|
||||
--FILE--
|
||||
|
||||
@@ -10,10 +10,22 @@ Bug #48555 (ImageFTBBox() differs from previous versions for texts with new line
|
||||
$cwd = dirname(__FILE__);
|
||||
$font = "$cwd/Tuffy.ttf";
|
||||
$box = ImageFTBBox(14, 0, $font, "Text without line-break");
|
||||
echo 'Top without line-break: ' . $box[7] . "\n";
|
||||
//echo 'Top without line-break: ' . $box[7] . "\n";
|
||||
$without_line_break = $box[7];
|
||||
$box = ImageFTBBox(14, 0, $font, "Text with\nline-break\none more");
|
||||
echo 'Top with line-break: ' . $box[7] . "\n";
|
||||
//echo 'Top with line-break: ' . $box[7] . "\n";
|
||||
$with_line_break = $box[7];
|
||||
|
||||
var_dump($without_line_break);
|
||||
var_dump($with_line_break);
|
||||
if ($with_line_break==$without_line_break) {
|
||||
echo "with line break == without line break".PHP_EOL;
|
||||
} else {
|
||||
echo "with line break != without line break".PHP_EOL;
|
||||
}
|
||||
|
||||
?>
|
||||
--EXPECTF--
|
||||
Top without line-break: -14
|
||||
Top with line-break: -14
|
||||
int(-%d)
|
||||
int(-%d)
|
||||
with line break == without line break
|
||||
@@ -322,8 +322,8 @@ query_loop:
|
||||
}
|
||||
result += 2;
|
||||
*(result+line_len) = 0;
|
||||
snprintf(heap_p, heap_buf_size - (heap_buf - heap_p), "%s\n", result);
|
||||
heap_p += line_len +2;
|
||||
snprintf(heap_p, heap_buf_size - (heap_p - heap_buf), "%s\n", result);
|
||||
heap_p += line_len +1;
|
||||
goto query_loop; /* repeat until result is exhausted */
|
||||
|
||||
case isc_info_svc_server_version:
|
||||
|
||||
@@ -83,11 +83,10 @@ PHP_FUNCTION( numfmt_parse )
|
||||
break;
|
||||
case FORMAT_TYPE_INT64:
|
||||
val64 = unum_parseInt64(FORMATTER_OBJECT(nfo), sstr, sstr_len, position_p, &INTL_DATA_ERROR_CODE(nfo));
|
||||
if(val64 > LONG_MAX || val64 < -LONG_MAX) {
|
||||
if(val64 > LONG_MAX || val64 < LONG_MIN) {
|
||||
RETVAL_DOUBLE(val64);
|
||||
} else {
|
||||
val32 = (int32_t)val64;
|
||||
RETVAL_LONG(val32);
|
||||
RETVAL_LONG((long)val64);
|
||||
}
|
||||
break;
|
||||
case FORMAT_TYPE_DOUBLE:
|
||||
|
||||
@@ -527,7 +527,7 @@ static void get_icu_disp_value_src_php( char* tag_name, INTERNAL_FUNCTION_PARAME
|
||||
|
||||
/* Get the disp_value for the given locale */
|
||||
do{
|
||||
disp_name = erealloc( disp_name , buflen );
|
||||
disp_name = erealloc( disp_name , buflen * sizeof(UChar) );
|
||||
disp_name_len = buflen;
|
||||
|
||||
if( strcmp(tag_name , LOC_LANG_TAG)==0 ){
|
||||
@@ -542,6 +542,7 @@ static void get_icu_disp_value_src_php( char* tag_name, INTERNAL_FUNCTION_PARAME
|
||||
buflen = uloc_getDisplayName ( mod_loc_name , disp_loc_name , disp_name , disp_name_len , &status);
|
||||
}
|
||||
|
||||
/* U_STRING_NOT_TERMINATED_WARNING is admissible here; don't look for it */
|
||||
if( U_FAILURE( status ) )
|
||||
{
|
||||
if( status == U_BUFFER_OVERFLOW_ERROR )
|
||||
@@ -1562,11 +1563,11 @@ PHP_FUNCTION(locale_lookup)
|
||||
/* }}} */
|
||||
|
||||
/* {{{ proto string Locale::acceptFromHttp(string $http_accept)
|
||||
* Tries to find out best available locale based on HTTP “Accept-Language” header
|
||||
* Tries to find out best available locale based on HTTP �Accept-Language� header
|
||||
*/
|
||||
/* }}} */
|
||||
/* {{{ proto string locale_accept_from_http(string $http_accept)
|
||||
* Tries to find out best available locale based on HTTP “Accept-Language” header
|
||||
* Tries to find out best available locale based on HTTP �Accept-Language� header
|
||||
*/
|
||||
PHP_FUNCTION(locale_accept_from_http)
|
||||
{
|
||||
|
||||
@@ -68,6 +68,10 @@ static void msgfmt_ctor(INTERNAL_FUNCTION_PARAMETERS)
|
||||
INTL_CTOR_CHECK_STATUS(mfo, "msgfmt_create: error converting pattern to quote-friendly format");
|
||||
}
|
||||
|
||||
if ((mfo)->mf_data.orig_format) {
|
||||
msgformat_data_free(&mfo->mf_data TSRMLS_CC);
|
||||
}
|
||||
|
||||
(mfo)->mf_data.orig_format = estrndup(pattern, pattern_len);
|
||||
(mfo)->mf_data.orig_format_len = pattern_len;
|
||||
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
--TEST--
|
||||
Bug#59597 NumberFormatter::parse() with TYPE_INT64 results in a 32 bit integer
|
||||
--SKIPIF--
|
||||
<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
|
||||
<?php echo PHP_INT_SIZE == 8 ? "skip 32-bit only" : "OK"; ?>
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
$formatter = new \NumberFormatter('en', \NumberFormatter::DECIMAL);
|
||||
$value = $formatter->parse('2147483647', \NumberFormatter::TYPE_INT32);
|
||||
var_dump($value);
|
||||
|
||||
$formatter = new \NumberFormatter('en', \NumberFormatter::DECIMAL);
|
||||
$value = $formatter->parse('2147483650', \NumberFormatter::TYPE_INT64);
|
||||
var_dump($value);
|
||||
|
||||
?>
|
||||
--EXPECT--
|
||||
int(2147483647)
|
||||
float(2147483650)
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
--TEST--
|
||||
Bug#59597 NumberFormatter::parse() with TYPE_INT64 results in a 32 bit integer
|
||||
--SKIPIF--
|
||||
<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
|
||||
<?php echo PHP_INT_SIZE != 8 ? "skip 64-bit only" : "OK"; ?>
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
$formatter = new \NumberFormatter('en', \NumberFormatter::DECIMAL);
|
||||
$value = $formatter->parse('2147483647', \NumberFormatter::TYPE_INT32);
|
||||
var_dump($value);
|
||||
|
||||
$formatter = new \NumberFormatter('en', \NumberFormatter::DECIMAL);
|
||||
$value = $formatter->parse('2147483650', \NumberFormatter::TYPE_INT64);
|
||||
var_dump($value);
|
||||
|
||||
?>
|
||||
--EXPECTREGEX--
|
||||
int(2147483647)
|
||||
int(2147483650)
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
--TEST--
|
||||
Bug #62082: Memory corruption in internal get_icu_disp_value_src_php()
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if (!extension_loaded('intl'))
|
||||
die('skip intl extension not enabled');
|
||||
--FILE--
|
||||
<?php
|
||||
var_dump(locale_get_display_name(str_repeat("a", 300), null));
|
||||
var_dump(locale_get_display_name(str_repeat("a", 512), null));
|
||||
var_dump(locale_get_display_name(str_repeat("a", 600), null));
|
||||
--EXPECT--
|
||||
string(300) "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
|
||||
string(512) "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
|
||||
string(600) "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
|
||||
+7
-4
@@ -73,6 +73,7 @@ static PHP_MINIT_FUNCTION(json)
|
||||
REGISTER_LONG_CONSTANT("JSON_HEX_QUOT", PHP_JSON_HEX_QUOT, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("JSON_FORCE_OBJECT", PHP_JSON_FORCE_OBJECT, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("JSON_NUMERIC_CHECK", PHP_JSON_NUMERIC_CHECK, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("JSON_PARTIAL_OUTPUT_ON_ERROR", PHP_JSON_PARTIAL_OUTPUT_ON_ERROR, CONST_CS | CONST_PERSISTENT);
|
||||
|
||||
REGISTER_LONG_CONSTANT("JSON_ERROR_NONE", PHP_JSON_ERROR_NONE, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("JSON_ERROR_DEPTH", PHP_JSON_ERROR_DEPTH, CONST_CS | CONST_PERSISTENT);
|
||||
@@ -320,9 +321,7 @@ static void json_escape_string(smart_str *buf, char *s, int len, int options TSR
|
||||
}
|
||||
if (len < 0) {
|
||||
JSON_G(error_code) = PHP_JSON_ERROR_UTF8;
|
||||
if (!PG(display_errors)) {
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid UTF-8 sequence in argument");
|
||||
}
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid UTF-8 sequence in argument");
|
||||
smart_str_appendl(buf, "null", 4);
|
||||
} else {
|
||||
smart_str_appendl(buf, "\"\"", 2);
|
||||
@@ -571,7 +570,11 @@ static PHP_FUNCTION(json_encode)
|
||||
|
||||
php_json_encode(&buf, parameter, options TSRMLS_CC);
|
||||
|
||||
ZVAL_STRINGL(return_value, buf.c, buf.len, 1);
|
||||
if (JSON_G(error_code) != PHP_JSON_ERROR_NONE && options ^ PHP_JSON_PARTIAL_OUTPUT_ON_ERROR) {
|
||||
ZVAL_FALSE(return_value);
|
||||
} else {
|
||||
ZVAL_STRINGL(return_value, buf.c, buf.len, 1);
|
||||
}
|
||||
|
||||
smart_str_free(&buf);
|
||||
}
|
||||
|
||||
@@ -56,6 +56,7 @@ PHP_JSON_API void php_json_decode(zval *return_value, char *str, int str_len, ze
|
||||
#define PHP_JSON_HEX_QUOT (1<<3)
|
||||
#define PHP_JSON_FORCE_OBJECT (1<<4)
|
||||
#define PHP_JSON_NUMERIC_CHECK (1<<5)
|
||||
#define PHP_JSON_PARTIAL_OUTPUT_ON_ERROR (1<<9)
|
||||
|
||||
#define PHP_JSON_OUTPUT_ARRAY 0
|
||||
#define PHP_JSON_OUTPUT_OBJECT 1
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
--TEST--
|
||||
Bug #43941 (json_encode() invalid UTF-8)
|
||||
--SKIPIF--
|
||||
<?php if (!extension_loaded("json")) print "skip"; ?>
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
var_dump(json_encode("abc"));
|
||||
var_dump(json_encode("ab\xE0"));
|
||||
var_dump(json_encode("ab\xE0c"));
|
||||
var_dump(json_encode(array("ab\xE0", "ab\xE0c", "abc")));
|
||||
|
||||
echo "Done\n";
|
||||
?>
|
||||
--EXPECTF--
|
||||
string(5) ""abc""
|
||||
string(4) "null"
|
||||
string(4) "null"
|
||||
string(17) "[null,null,"abc"]"
|
||||
Done
|
||||
|
||||
@@ -29,7 +29,14 @@ json_encode($c);
|
||||
var_dump(json_last_error());
|
||||
?>
|
||||
--EXPECTF--
|
||||
Warning: json_encode(): Invalid UTF-8 sequence in argument in %s on line %d
|
||||
int(5)
|
||||
|
||||
Warning: json_encode(): Invalid UTF-8 sequence in argument in %s on line %d
|
||||
int(5)
|
||||
|
||||
Warning: json_encode(): Invalid UTF-8 sequence in argument in %s on line %d
|
||||
int(5)
|
||||
|
||||
Warning: json_encode(): Invalid UTF-8 sequence in argument in %s on line %d
|
||||
int(5)
|
||||
@@ -0,0 +1,30 @@
|
||||
--TEST--
|
||||
Bug #61537 (json_encode() incorrectly truncates/discards information)
|
||||
--SKIPIF--
|
||||
<?php if (!extension_loaded("json")) print "skip"; ?>
|
||||
--FILE--
|
||||
<?php
|
||||
$invalid_utf8 = "\x9f";
|
||||
var_dump(json_encode($invalid_utf8), json_last_error());
|
||||
var_dump(json_encode($invalid_utf8, JSON_PARTIAL_OUTPUT_ON_ERROR), json_last_error());
|
||||
|
||||
$invalid_utf8 = "an invalid sequen\xce in the middle of a string";
|
||||
var_dump(json_encode($invalid_utf8), json_last_error());
|
||||
var_dump(json_encode($invalid_utf8, JSON_PARTIAL_OUTPUT_ON_ERROR), json_last_error());
|
||||
?>
|
||||
--EXPECTF--
|
||||
Warning: json_encode(): Invalid UTF-8 sequence in argument in %s on line %d
|
||||
bool(false)
|
||||
int(5)
|
||||
|
||||
Warning: json_encode(): Invalid UTF-8 sequence in argument in %s on line %d
|
||||
string(4) "null"
|
||||
int(5)
|
||||
|
||||
Warning: json_encode(): Invalid UTF-8 sequence in argument in %s on line %d
|
||||
bool(false)
|
||||
int(5)
|
||||
|
||||
Warning: json_encode(): Invalid UTF-8 sequence in argument in %s on line %d
|
||||
string(4) "null"
|
||||
int(5)
|
||||
@@ -6,6 +6,13 @@ Patrick Allaert <patrickallaert@php.net>
|
||||
--SKIPIF--
|
||||
<?php require_once('skipif.inc'); ?>
|
||||
<?php if (!function_exists("ldap_sasl_bind")) die("skip LDAP extension not compiled with SASL support"); ?>
|
||||
<?php
|
||||
require "connect.inc";
|
||||
$link = fsockopen($host, $port);
|
||||
if (!$link) {
|
||||
die("skip no server listening");
|
||||
}
|
||||
?>
|
||||
--FILE--
|
||||
<?php
|
||||
require "connect.inc";
|
||||
|
||||
@@ -5,6 +5,16 @@ Patrick Allaert <patrickallaert@php.net>
|
||||
# Belgian PHP Testfest 2009
|
||||
--SKIPIF--
|
||||
<?php require_once('skipif.inc'); ?>
|
||||
<?php
|
||||
if (!function_exists("ldap_set_rebind_proc")) {
|
||||
die("skip ldap_set_rebind_proc() does not exist");
|
||||
}
|
||||
require "connect.inc";
|
||||
$link = fsockopen($host, $port);
|
||||
if (!$link) {
|
||||
die("skip no server listening");
|
||||
}
|
||||
?>
|
||||
--FILE--
|
||||
<?php
|
||||
require "connect.inc";
|
||||
|
||||
+2
-1
@@ -666,7 +666,8 @@ static int php_libxml_post_deactivate()
|
||||
xmlOutputBufferCreateFilenameDefault(NULL);
|
||||
|
||||
if (LIBXML(stream_context)) {
|
||||
zval_ptr_dtor(&LIBXML(stream_context));
|
||||
/* the steam_context resource will be released by resource list destructor */
|
||||
efree(LIBXML(stream_context));
|
||||
LIBXML(stream_context) = NULL;
|
||||
}
|
||||
smart_str_free(&LIBXML(error_buffer));
|
||||
|
||||
@@ -15,6 +15,7 @@ class StreamExploiter {
|
||||
$doc->resolveExternals = true;
|
||||
$doc->substituteEntities = true;
|
||||
$dir = htmlspecialchars(dirname(getcwd()));
|
||||
$dir = str_replace('\\', '/', $dir); // fix for windows
|
||||
$doc->loadXML( <<<XML
|
||||
<!DOCTYPE doc [
|
||||
<!ENTITY file SYSTEM "file:///$dir/bad">
|
||||
|
||||
@@ -2,6 +2,9 @@
|
||||
Bug #52681 (mb_send_mail() appends an extra MIME-Version header)
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if (substr(PHP_OS, 0, 3) == 'WIN') {
|
||||
die('skip.. Not valid for Windows');
|
||||
}
|
||||
if (!function_exists("mb_send_mail") || !mb_language("neutral")) {
|
||||
die("skip mb_send_mail() not available");
|
||||
}
|
||||
|
||||
@@ -2,6 +2,9 @@
|
||||
mb_send_mail() test 1 (lang=neutral)
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if (substr(PHP_OS, 0, 3) == 'WIN') {
|
||||
die('skip.. Not valid for Windows');
|
||||
}
|
||||
if (!function_exists("mb_send_mail") || !mb_language("neutral")) {
|
||||
die("skip mb_send_mail() not available");
|
||||
}
|
||||
|
||||
@@ -2,6 +2,9 @@
|
||||
mb_send_mail() test 2 (lang=Japanese)
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if (substr(PHP_OS, 0, 3) == 'WIN') {
|
||||
die('skip.. Not valid for Windows');
|
||||
}
|
||||
if (!function_exists("mb_send_mail") || !mb_language("japanese")) {
|
||||
die("skip mb_send_mail() not available");
|
||||
}
|
||||
|
||||
@@ -2,6 +2,9 @@
|
||||
mb_send_mail() test 3 (lang=English)
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if (substr(PHP_OS, 0, 3) == 'WIN') {
|
||||
die('skip.. Not valid for Windows');
|
||||
}
|
||||
if (!function_exists("mb_send_mail") || !mb_language("english")) {
|
||||
die("skip mb_send_mail() not available");
|
||||
}
|
||||
|
||||
@@ -2,6 +2,9 @@
|
||||
mb_send_mail() test 4 (lang=German)
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if (substr(PHP_OS, 0, 3) == 'WIN') {
|
||||
die('skip.. Not valid for Windows');
|
||||
}
|
||||
if (!function_exists("mb_send_mail") || !mb_language("german")) {
|
||||
die("skip mb_send_mail() not available");
|
||||
}
|
||||
|
||||
@@ -2,6 +2,9 @@
|
||||
mb_send_mail() test 5 (lang=Simplified Chinese)
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if (substr(PHP_OS, 0, 3) == 'WIN') {
|
||||
die('skip.. Not valid for Windows');
|
||||
}
|
||||
if (!function_exists("mb_send_mail") || !mb_language("Simplified Chinese")) {
|
||||
die("skip mb_send_mail() not available");
|
||||
}
|
||||
|
||||
@@ -2,6 +2,9 @@
|
||||
mb_send_mail() test 6 (lang=Traditional Chinese)
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if (substr(PHP_OS, 0, 3) == 'WIN') {
|
||||
die('skip.. Not valid for Windows');
|
||||
}
|
||||
if (!function_exists("mb_send_mail") || !mb_language("Traditional Chinese")) {
|
||||
die("skip mb_send_mail() not available");
|
||||
}
|
||||
|
||||
@@ -2,6 +2,9 @@
|
||||
mb_send_mail() test 7 (lang=Korean)
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if (substr(PHP_OS, 0, 3) == 'WIN') {
|
||||
die('skip.. Not valid for Windows');
|
||||
}
|
||||
if (!function_exists("mb_send_mail") || !mb_language("Korean")) {
|
||||
die("skip mb_send_mail() not available");
|
||||
}
|
||||
|
||||
@@ -1630,9 +1630,9 @@ MYSQLND_METHOD(mysqlnd_stmt, bind_one_result)(MYSQLND_STMT * const s, unsigned i
|
||||
mysqlnd_stmt_separate_one_result_bind(s, param_no TSRMLS_CC);
|
||||
/* Guaranteed is that stmt->result_bind is NULL */
|
||||
if (!stmt->result_bind) {
|
||||
stmt->result_bind = mnd_ecalloc(stmt->field_count, sizeof(MYSQLND_RESULT_BIND));
|
||||
stmt->result_bind = mnd_pecalloc(stmt->field_count, sizeof(MYSQLND_RESULT_BIND), stmt->persistent);
|
||||
} else {
|
||||
stmt->result_bind = mnd_erealloc(stmt->result_bind, stmt->field_count * sizeof(MYSQLND_RESULT_BIND));
|
||||
stmt->result_bind = mnd_perealloc(stmt->result_bind, stmt->field_count * sizeof(MYSQLND_RESULT_BIND), stmt->persistent);
|
||||
}
|
||||
if (!stmt->result_bind) {
|
||||
DBG_RETURN(FAIL);
|
||||
|
||||
@@ -0,0 +1,82 @@
|
||||
--TEST--
|
||||
Test OCI8 php.ini settings
|
||||
--SKIPIF--
|
||||
<?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); ?>
|
||||
--INI--
|
||||
oci8.privileged_connect = On
|
||||
oci8.max_persistent = 111
|
||||
oci8.persistent_timeout = 222
|
||||
oci8.ping_interval = 333
|
||||
oci8.connection_class = MyCC
|
||||
oci8.events = On
|
||||
oci8.statement_cache_size = 444
|
||||
oci8.default_prefetch = 555
|
||||
oci8.old_oci_close_semantics = On
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
echo "Test 1 - check initialization\n";
|
||||
echo 'oci8.privileged_connect = ' . ini_get('oci8.privileged_connect') . "\n";
|
||||
echo 'oci8.max_persistent = ' . ini_get('oci8.max_persistent') . "\n";
|
||||
echo 'oci8.persistent_timeout = ' . ini_get('oci8.persistent_timeout') . "\n";
|
||||
echo 'oci8.ping_interval = ' . ini_get('oci8.ping_interval') . "\n";
|
||||
echo 'oci8.connection_class = ' . ini_get('oci8.connection_class') . "\n";
|
||||
echo 'oci8.events = ' . ini_get('oci8.events') . "\n";
|
||||
echo 'oci8.statement_cache_size = ' . ini_get('oci8.statement_cache_size') . "\n";
|
||||
echo 'oci8.default_prefetch = ' . ini_get('oci8.default_prefetch') . "\n";
|
||||
echo 'oci8.old_oci_close_semantics = ' . ini_get('oci8.old_oci_close_semantics') . "\n";
|
||||
|
||||
echo "Test 2 - check what can be changed at runtime\n";
|
||||
var_dump(ini_set('oci8.privileged_connect', 'Off'));
|
||||
echo 'oci8.privileged_connect = ' . ini_get('oci8.privileged_connect') . "\n";
|
||||
var_dump(ini_set('oci8.max_persistent', '999'));
|
||||
echo 'oci8.max_persistent = ' . ini_get('oci8.max_persistent') . "\n";
|
||||
var_dump(ini_set('oci8.persistent_timeout', '888'));
|
||||
echo 'oci8.persistent_timeout = ' . ini_get('oci8.persistent_timeout') . "\n";
|
||||
var_dump(ini_set('oci8.ping_interval', '777'));
|
||||
echo 'oci8.ping_interval = ' . ini_get('oci8.ping_interval') . "\n";
|
||||
var_dump(ini_set('oci8.connection_class', 'OtherCC'));
|
||||
echo 'oci8.connection_class = ' . ini_get('oci8.connection_class') . "\n";
|
||||
var_dump(ini_set('oci8.events', 'Off'));
|
||||
echo 'oci8.events = ' . ini_get('oci8.events') . "\n";
|
||||
var_dump(ini_set('oci8.statement_cache_size', '666'));
|
||||
echo 'oci8.statement_cache_size = ' . ini_get('oci8.statement_cache_size') . "\n";
|
||||
var_dump(ini_set('oci8.default_prefetch', '111'));
|
||||
echo 'oci8.default_prefetch = ' . ini_get('oci8.default_prefetch') . "\n";
|
||||
var_dump(ini_set('oci8.old_oci_close_semantics', 'Off'));
|
||||
echo 'oci8.old_oci_close_semantics = ' . ini_get('oci8.old_oci_close_semantics') . "\n";
|
||||
|
||||
?>
|
||||
===DONE===
|
||||
<?php exit(0); ?>
|
||||
--EXPECTF--
|
||||
Test 1 - check initialization
|
||||
oci8.privileged_connect = 1
|
||||
oci8.max_persistent = 111
|
||||
oci8.persistent_timeout = 222
|
||||
oci8.ping_interval = 333
|
||||
oci8.connection_class = MyCC
|
||||
oci8.events = 1
|
||||
oci8.statement_cache_size = 444
|
||||
oci8.default_prefetch = 555
|
||||
oci8.old_oci_close_semantics = 1
|
||||
Test 2 - check what can be changed at runtime
|
||||
bool(false)
|
||||
oci8.privileged_connect = 1
|
||||
bool(false)
|
||||
oci8.max_persistent = 111
|
||||
bool(false)
|
||||
oci8.persistent_timeout = 222
|
||||
bool(false)
|
||||
oci8.ping_interval = 333
|
||||
string(4) "MyCC"
|
||||
oci8.connection_class = OtherCC
|
||||
bool(false)
|
||||
oci8.events = 1
|
||||
bool(false)
|
||||
oci8.statement_cache_size = 444
|
||||
bool(false)
|
||||
oci8.default_prefetch = 555
|
||||
bool(false)
|
||||
oci8.old_oci_close_semantics = 1
|
||||
===DONE===
|
||||
@@ -4677,7 +4677,7 @@ PHP_FUNCTION(openssl_encrypt)
|
||||
int data_len, method_len, password_len, iv_len = 0, max_iv_len;
|
||||
const EVP_CIPHER *cipher_type;
|
||||
EVP_CIPHER_CTX cipher_ctx;
|
||||
int i, outlen, keylen;
|
||||
int i = 0, outlen, keylen;
|
||||
unsigned char *outbuf, *key;
|
||||
zend_bool free_iv;
|
||||
|
||||
|
||||
@@ -4,6 +4,10 @@ PDO_HEADER_FILES= \
|
||||
php_pdo.h \
|
||||
php_pdo_driver.h
|
||||
|
||||
|
||||
$(srcdir)/pdo_sql_parser.c: $(srcdir)/pdo_sql_parser.re
|
||||
(cd $(top_srcdir); $(RE2C) -o ext/pdo/pdo_sql_parser.c ext/pdo/pdo_sql_parser.re)
|
||||
|
||||
install-pdo-headers:
|
||||
@echo "Installing PDO headers: $(INSTALL_ROOT)$(phpincludedir)/ext/pdo/"
|
||||
@$(mkinstalldirs) $(INSTALL_ROOT)$(phpincludedir)/ext/pdo
|
||||
|
||||
+155
-158
@@ -1,4 +1,4 @@
|
||||
/* Generated by re2c 0.13.5 on Sat Jun 4 18:42:25 2011 */
|
||||
/* Generated by re2c 0.13.5 on Thu Apr 19 12:42:11 2012 */
|
||||
#line 1 "ext/pdo/pdo_sql_parser.re"
|
||||
/*
|
||||
+----------------------------------------------------------------------+
|
||||
@@ -34,12 +34,12 @@
|
||||
|
||||
#define YYCTYPE unsigned char
|
||||
#define YYCURSOR cursor
|
||||
#define YYLIMIT cursor
|
||||
#define YYLIMIT s->end
|
||||
#define YYMARKER s->ptr
|
||||
#define YYFILL(n)
|
||||
#define YYFILL(n) { RET(PDO_PARSER_EOI); }
|
||||
|
||||
typedef struct Scanner {
|
||||
char *ptr, *cur, *tok;
|
||||
char *ptr, *cur, *tok, *end;
|
||||
} Scanner;
|
||||
|
||||
static int scan(Scanner *s)
|
||||
@@ -47,7 +47,7 @@ static int scan(Scanner *s)
|
||||
char *cursor = s->cur;
|
||||
|
||||
s->tok = cursor;
|
||||
#line 56 "ext/pdo/pdo_sql_parser.re"
|
||||
#line 55 "ext/pdo/pdo_sql_parser.re"
|
||||
|
||||
|
||||
|
||||
@@ -59,29 +59,35 @@ static int scan(Scanner *s)
|
||||
if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
|
||||
yych = *YYCURSOR;
|
||||
switch (yych) {
|
||||
case 0x00: goto yy13;
|
||||
case '"': goto yy2;
|
||||
case '\'': goto yy4;
|
||||
case '-': goto yy10;
|
||||
case '/': goto yy8;
|
||||
case ':': goto yy5;
|
||||
case '?': goto yy6;
|
||||
default: goto yy11;
|
||||
case 0x00: goto yy2;
|
||||
case '"': goto yy3;
|
||||
case '\'': goto yy5;
|
||||
case '-': goto yy11;
|
||||
case '/': goto yy9;
|
||||
case ':': goto yy6;
|
||||
case '?': goto yy7;
|
||||
default: goto yy12;
|
||||
}
|
||||
yy2:
|
||||
yyaccept = 0;
|
||||
yych = *(YYMARKER = ++YYCURSOR);
|
||||
if (yych >= 0x01) goto yy43;
|
||||
YYCURSOR = YYMARKER;
|
||||
switch (yyaccept) {
|
||||
case 0: goto yy4;
|
||||
case 1: goto yy10;
|
||||
}
|
||||
yy3:
|
||||
#line 64 "ext/pdo/pdo_sql_parser.re"
|
||||
{ SKIP_ONE(PDO_PARSER_TEXT); }
|
||||
#line 79 "ext/pdo/pdo_sql_parser.c"
|
||||
yy4:
|
||||
yyaccept = 0;
|
||||
yych = *(YYMARKER = ++YYCURSOR);
|
||||
if (yych <= 0x00) goto yy3;
|
||||
goto yy37;
|
||||
if (yych >= 0x01) goto yy41;
|
||||
yy4:
|
||||
#line 63 "ext/pdo/pdo_sql_parser.re"
|
||||
{ SKIP_ONE(PDO_PARSER_TEXT); }
|
||||
#line 85 "ext/pdo/pdo_sql_parser.c"
|
||||
yy5:
|
||||
yyaccept = 0;
|
||||
yych = *(YYMARKER = ++YYCURSOR);
|
||||
if (yych <= 0x00) goto yy4;
|
||||
goto yy36;
|
||||
yy6:
|
||||
yych = *++YYCURSOR;
|
||||
switch (yych) {
|
||||
case '0':
|
||||
@@ -146,84 +152,79 @@ yy5:
|
||||
case 'w':
|
||||
case 'x':
|
||||
case 'y':
|
||||
case 'z': goto yy33;
|
||||
case 'z': goto yy32;
|
||||
case ':':
|
||||
case '?': goto yy30;
|
||||
default: goto yy3;
|
||||
}
|
||||
yy6:
|
||||
++YYCURSOR;
|
||||
switch ((yych = *YYCURSOR)) {
|
||||
case ':':
|
||||
case '?': goto yy30;
|
||||
default: goto yy7;
|
||||
case '?': goto yy29;
|
||||
default: goto yy4;
|
||||
}
|
||||
yy7:
|
||||
#line 63 "ext/pdo/pdo_sql_parser.re"
|
||||
{ RET(PDO_PARSER_BIND_POS); }
|
||||
#line 165 "ext/pdo/pdo_sql_parser.c"
|
||||
yy8:
|
||||
++YYCURSOR;
|
||||
switch ((yych = *YYCURSOR)) {
|
||||
case '*': goto yy20;
|
||||
default: goto yy12;
|
||||
case ':':
|
||||
case '?': goto yy29;
|
||||
default: goto yy8;
|
||||
}
|
||||
yy8:
|
||||
#line 62 "ext/pdo/pdo_sql_parser.re"
|
||||
{ RET(PDO_PARSER_BIND_POS); }
|
||||
#line 171 "ext/pdo/pdo_sql_parser.c"
|
||||
yy9:
|
||||
#line 66 "ext/pdo/pdo_sql_parser.re"
|
||||
{ RET(PDO_PARSER_TEXT); }
|
||||
#line 175 "ext/pdo/pdo_sql_parser.c"
|
||||
++YYCURSOR;
|
||||
switch ((yych = *YYCURSOR)) {
|
||||
case '*': goto yy19;
|
||||
default: goto yy13;
|
||||
}
|
||||
yy10:
|
||||
yych = *++YYCURSOR;
|
||||
switch (yych) {
|
||||
case '-': goto yy15;
|
||||
default: goto yy12;
|
||||
}
|
||||
yy11:
|
||||
++YYCURSOR;
|
||||
if (YYLIMIT <= YYCURSOR) YYFILL(1);
|
||||
yych = *YYCURSOR;
|
||||
yy12:
|
||||
switch (yych) {
|
||||
case 0x00:
|
||||
case '"':
|
||||
case '\'':
|
||||
case ':':
|
||||
case '?': goto yy9;
|
||||
default: goto yy11;
|
||||
}
|
||||
yy13:
|
||||
++YYCURSOR;
|
||||
#line 67 "ext/pdo/pdo_sql_parser.re"
|
||||
{ RET(PDO_PARSER_EOI); }
|
||||
#line 199 "ext/pdo/pdo_sql_parser.c"
|
||||
yy15:
|
||||
++YYCURSOR;
|
||||
if (YYLIMIT <= YYCURSOR) YYFILL(1);
|
||||
yych = *YYCURSOR;
|
||||
switch (yych) {
|
||||
case 0x00:
|
||||
case '"':
|
||||
case '\'':
|
||||
case ':':
|
||||
case '?': goto yy18;
|
||||
case '\n':
|
||||
case '\r': goto yy11;
|
||||
default: goto yy15;
|
||||
}
|
||||
yy17:
|
||||
#line 65 "ext/pdo/pdo_sql_parser.re"
|
||||
{ RET(PDO_PARSER_TEXT); }
|
||||
#line 217 "ext/pdo/pdo_sql_parser.c"
|
||||
yy18:
|
||||
#line 181 "ext/pdo/pdo_sql_parser.c"
|
||||
yy11:
|
||||
yych = *++YYCURSOR;
|
||||
switch (yych) {
|
||||
case '-': goto yy14;
|
||||
default: goto yy13;
|
||||
}
|
||||
yy12:
|
||||
++YYCURSOR;
|
||||
if (YYLIMIT <= YYCURSOR) YYFILL(1);
|
||||
yych = *YYCURSOR;
|
||||
yy13:
|
||||
switch (yych) {
|
||||
case 0x00:
|
||||
case '"':
|
||||
case '\'':
|
||||
case ':':
|
||||
case '?': goto yy10;
|
||||
default: goto yy12;
|
||||
}
|
||||
yy14:
|
||||
++YYCURSOR;
|
||||
if (YYLIMIT <= YYCURSOR) YYFILL(1);
|
||||
yych = *YYCURSOR;
|
||||
switch (yych) {
|
||||
case 0x00:
|
||||
case '"':
|
||||
case '\'':
|
||||
case ':':
|
||||
case '?': goto yy17;
|
||||
case '\n':
|
||||
case '\r': goto yy12;
|
||||
default: goto yy14;
|
||||
}
|
||||
yy16:
|
||||
#line 64 "ext/pdo/pdo_sql_parser.re"
|
||||
{ RET(PDO_PARSER_TEXT); }
|
||||
#line 218 "ext/pdo/pdo_sql_parser.c"
|
||||
yy17:
|
||||
++YYCURSOR;
|
||||
if (YYLIMIT <= YYCURSOR) YYFILL(1);
|
||||
yych = *YYCURSOR;
|
||||
switch (yych) {
|
||||
case '\n':
|
||||
case '\r': goto yy17;
|
||||
default: goto yy18;
|
||||
case '\r': goto yy16;
|
||||
default: goto yy17;
|
||||
}
|
||||
yy20:
|
||||
yy19:
|
||||
yyaccept = 1;
|
||||
YYMARKER = ++YYCURSOR;
|
||||
if (YYLIMIT <= YYCURSOR) YYFILL(1);
|
||||
@@ -233,19 +234,19 @@ yy20:
|
||||
case '"':
|
||||
case '\'':
|
||||
case ':':
|
||||
case '?': goto yy22;
|
||||
case '*': goto yy24;
|
||||
default: goto yy20;
|
||||
case '?': goto yy21;
|
||||
case '*': goto yy23;
|
||||
default: goto yy19;
|
||||
}
|
||||
yy22:
|
||||
yy21:
|
||||
++YYCURSOR;
|
||||
if (YYLIMIT <= YYCURSOR) YYFILL(1);
|
||||
yych = *YYCURSOR;
|
||||
switch (yych) {
|
||||
case '*': goto yy27;
|
||||
default: goto yy22;
|
||||
case '*': goto yy26;
|
||||
default: goto yy21;
|
||||
}
|
||||
yy24:
|
||||
yy23:
|
||||
yyaccept = 1;
|
||||
YYMARKER = ++YYCURSOR;
|
||||
if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
|
||||
@@ -255,47 +256,47 @@ yy24:
|
||||
case '"':
|
||||
case '\'':
|
||||
case ':':
|
||||
case '?': goto yy22;
|
||||
case '*': goto yy24;
|
||||
case '/': goto yy26;
|
||||
default: goto yy20;
|
||||
case '?': goto yy21;
|
||||
case '*': goto yy23;
|
||||
case '/': goto yy25;
|
||||
default: goto yy19;
|
||||
}
|
||||
yy26:
|
||||
yy25:
|
||||
yych = *++YYCURSOR;
|
||||
switch (yych) {
|
||||
case 0x00:
|
||||
case '"':
|
||||
case '\'':
|
||||
case ':':
|
||||
case '?': goto yy17;
|
||||
default: goto yy11;
|
||||
case '?': goto yy16;
|
||||
default: goto yy12;
|
||||
}
|
||||
yy27:
|
||||
yy26:
|
||||
++YYCURSOR;
|
||||
if (YYLIMIT <= YYCURSOR) YYFILL(1);
|
||||
yych = *YYCURSOR;
|
||||
switch (yych) {
|
||||
case '*': goto yy27;
|
||||
case '/': goto yy29;
|
||||
default: goto yy22;
|
||||
case '*': goto yy26;
|
||||
case '/': goto yy28;
|
||||
default: goto yy21;
|
||||
}
|
||||
yy29:
|
||||
yy28:
|
||||
yych = *++YYCURSOR;
|
||||
goto yy17;
|
||||
yy30:
|
||||
goto yy16;
|
||||
yy29:
|
||||
++YYCURSOR;
|
||||
if (YYLIMIT <= YYCURSOR) YYFILL(1);
|
||||
yych = *YYCURSOR;
|
||||
switch (yych) {
|
||||
case ':':
|
||||
case '?': goto yy30;
|
||||
default: goto yy32;
|
||||
case '?': goto yy29;
|
||||
default: goto yy31;
|
||||
}
|
||||
yy32:
|
||||
#line 61 "ext/pdo/pdo_sql_parser.re"
|
||||
yy31:
|
||||
#line 60 "ext/pdo/pdo_sql_parser.re"
|
||||
{ RET(PDO_PARSER_TEXT); }
|
||||
#line 298 "ext/pdo/pdo_sql_parser.c"
|
||||
yy33:
|
||||
#line 299 "ext/pdo/pdo_sql_parser.c"
|
||||
yy32:
|
||||
++YYCURSOR;
|
||||
if (YYLIMIT <= YYCURSOR) YYFILL(1);
|
||||
yych = *YYCURSOR;
|
||||
@@ -362,65 +363,59 @@ yy33:
|
||||
case 'w':
|
||||
case 'x':
|
||||
case 'y':
|
||||
case 'z': goto yy33;
|
||||
case 'z': goto yy32;
|
||||
default: goto yy34;
|
||||
}
|
||||
yy34:
|
||||
#line 61 "ext/pdo/pdo_sql_parser.re"
|
||||
{ RET(PDO_PARSER_BIND); }
|
||||
#line 373 "ext/pdo/pdo_sql_parser.c"
|
||||
yy35:
|
||||
++YYCURSOR;
|
||||
if (YYLIMIT <= YYCURSOR) YYFILL(1);
|
||||
yych = *YYCURSOR;
|
||||
yy36:
|
||||
switch (yych) {
|
||||
case 0x00: goto yy2;
|
||||
case '\'': goto yy38;
|
||||
case '\\': goto yy37;
|
||||
default: goto yy35;
|
||||
}
|
||||
yy35:
|
||||
#line 62 "ext/pdo/pdo_sql_parser.re"
|
||||
{ RET(PDO_PARSER_BIND); }
|
||||
#line 372 "ext/pdo/pdo_sql_parser.c"
|
||||
yy36:
|
||||
++YYCURSOR;
|
||||
if (YYLIMIT <= YYCURSOR) YYFILL(1);
|
||||
yych = *YYCURSOR;
|
||||
yy37:
|
||||
switch (yych) {
|
||||
case 0x00: goto yy38;
|
||||
case '\'': goto yy40;
|
||||
case '\\': goto yy39;
|
||||
default: goto yy36;
|
||||
}
|
||||
yy38:
|
||||
YYCURSOR = YYMARKER;
|
||||
switch (yyaccept) {
|
||||
case 0: goto yy3;
|
||||
case 1: goto yy9;
|
||||
}
|
||||
yy39:
|
||||
++YYCURSOR;
|
||||
if (YYLIMIT <= YYCURSOR) YYFILL(1);
|
||||
yych = *YYCURSOR;
|
||||
if (yych <= 0x00) goto yy38;
|
||||
goto yy36;
|
||||
if (yych <= 0x00) goto yy2;
|
||||
goto yy35;
|
||||
yy38:
|
||||
++YYCURSOR;
|
||||
#line 59 "ext/pdo/pdo_sql_parser.re"
|
||||
{ RET(PDO_PARSER_TEXT); }
|
||||
#line 395 "ext/pdo/pdo_sql_parser.c"
|
||||
yy40:
|
||||
++YYCURSOR;
|
||||
#line 60 "ext/pdo/pdo_sql_parser.re"
|
||||
{ RET(PDO_PARSER_TEXT); }
|
||||
#line 400 "ext/pdo/pdo_sql_parser.c"
|
||||
if (YYLIMIT <= YYCURSOR) YYFILL(1);
|
||||
yych = *YYCURSOR;
|
||||
yy41:
|
||||
switch (yych) {
|
||||
case 0x00: goto yy2;
|
||||
case '"': goto yy43;
|
||||
case '\\': goto yy42;
|
||||
default: goto yy40;
|
||||
}
|
||||
yy42:
|
||||
++YYCURSOR;
|
||||
if (YYLIMIT <= YYCURSOR) YYFILL(1);
|
||||
yych = *YYCURSOR;
|
||||
if (yych <= 0x00) goto yy2;
|
||||
goto yy40;
|
||||
yy43:
|
||||
switch (yych) {
|
||||
case 0x00: goto yy38;
|
||||
case '"': goto yy45;
|
||||
case '\\': goto yy44;
|
||||
default: goto yy42;
|
||||
}
|
||||
yy44:
|
||||
++YYCURSOR;
|
||||
if (YYLIMIT <= YYCURSOR) YYFILL(1);
|
||||
yych = *YYCURSOR;
|
||||
if (yych <= 0x00) goto yy38;
|
||||
goto yy42;
|
||||
yy45:
|
||||
++YYCURSOR;
|
||||
#line 59 "ext/pdo/pdo_sql_parser.re"
|
||||
#line 58 "ext/pdo/pdo_sql_parser.re"
|
||||
{ RET(PDO_PARSER_TEXT); }
|
||||
#line 422 "ext/pdo/pdo_sql_parser.c"
|
||||
#line 417 "ext/pdo/pdo_sql_parser.c"
|
||||
}
|
||||
#line 68 "ext/pdo/pdo_sql_parser.re"
|
||||
#line 66 "ext/pdo/pdo_sql_parser.re"
|
||||
|
||||
}
|
||||
|
||||
@@ -450,6 +445,7 @@ PDO_API int pdo_parse_params(pdo_stmt_t *stmt, char *inquery, int inquery_len,
|
||||
|
||||
ptr = *outquery;
|
||||
s.cur = inquery;
|
||||
s.end = inquery + inquery_len + 1;
|
||||
|
||||
/* phase 1: look for args */
|
||||
while((t = scan(&s)) != PDO_PARSER_EOI) {
|
||||
@@ -569,7 +565,7 @@ safe:
|
||||
param->param_type TSRMLS_CC)) {
|
||||
/* bork */
|
||||
ret = -1;
|
||||
strcpy(stmt->error_code, stmt->dbh->error_code);
|
||||
strncpy(stmt->error_code, stmt->dbh->error_code, 6);
|
||||
if (buf) {
|
||||
efree(buf);
|
||||
}
|
||||
@@ -592,6 +588,9 @@ safe:
|
||||
plc->freeq = 0;
|
||||
break;
|
||||
|
||||
case IS_BOOL:
|
||||
convert_to_long(param->parameter);
|
||||
|
||||
case IS_LONG:
|
||||
case IS_DOUBLE:
|
||||
convert_to_string(param->parameter);
|
||||
@@ -600,8 +599,6 @@ safe:
|
||||
plc->freeq = 0;
|
||||
break;
|
||||
|
||||
case IS_BOOL:
|
||||
convert_to_long(param->parameter);
|
||||
default:
|
||||
convert_to_string(param->parameter);
|
||||
if (!stmt->dbh->methods->quoter(stmt->dbh, Z_STRVAL_P(param->parameter),
|
||||
@@ -609,7 +606,7 @@ safe:
|
||||
param->param_type TSRMLS_CC)) {
|
||||
/* bork */
|
||||
ret = -1;
|
||||
strcpy(stmt->error_code, stmt->dbh->error_code);
|
||||
strncpy(stmt->error_code, stmt->dbh->error_code, 6);
|
||||
goto clean_up;
|
||||
}
|
||||
plc->freeq = 1;
|
||||
|
||||
@@ -32,12 +32,12 @@
|
||||
|
||||
#define YYCTYPE unsigned char
|
||||
#define YYCURSOR cursor
|
||||
#define YYLIMIT cursor
|
||||
#define YYLIMIT s->end
|
||||
#define YYMARKER s->ptr
|
||||
#define YYFILL(n)
|
||||
#define YYFILL(n) { RET(PDO_PARSER_EOI); }
|
||||
|
||||
typedef struct Scanner {
|
||||
char *ptr, *cur, *tok;
|
||||
char *ptr, *cur, *tok, *end;
|
||||
} Scanner;
|
||||
|
||||
static int scan(Scanner *s)
|
||||
@@ -51,7 +51,6 @@ static int scan(Scanner *s)
|
||||
COMMENTS = ("/*"([^*]+|[*]+[^/*])*[*]*"*/"|"--"[^\r\n]*);
|
||||
SPECIALS = [:?"'];
|
||||
MULTICHAR = [:?];
|
||||
EOF = [\000];
|
||||
ANYNOEOF = [\001-\377];
|
||||
*/
|
||||
|
||||
@@ -64,7 +63,6 @@ static int scan(Scanner *s)
|
||||
SPECIALS { SKIP_ONE(PDO_PARSER_TEXT); }
|
||||
COMMENTS { RET(PDO_PARSER_TEXT); }
|
||||
(ANYNOEOF\SPECIALS)+ { RET(PDO_PARSER_TEXT); }
|
||||
EOF { RET(PDO_PARSER_EOI); }
|
||||
*/
|
||||
}
|
||||
|
||||
@@ -94,6 +92,7 @@ PDO_API int pdo_parse_params(pdo_stmt_t *stmt, char *inquery, int inquery_len,
|
||||
|
||||
ptr = *outquery;
|
||||
s.cur = inquery;
|
||||
s.end = inquery + inquery_len + 1;
|
||||
|
||||
/* phase 1: look for args */
|
||||
while((t = scan(&s)) != PDO_PARSER_EOI) {
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
--TEST--
|
||||
Bug #61411 (PDO Segfaults with PERSISTENT == TRUE && EMULATE_PREPARES == FALSE)
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if (!extension_loaded('pdo') || !extension_loaded('pdo_mysql')) die('skip not loaded');
|
||||
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc');
|
||||
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
|
||||
MySQLPDOTest::skip();
|
||||
$db = MySQLPDOTest::factory();
|
||||
|
||||
$row = $db->query('SELECT VERSION() as _version')->fetch(PDO::FETCH_ASSOC);
|
||||
$matches = array();
|
||||
if (!preg_match('/^(\d+)\.(\d+)\.(\d+)/ismU', $row['_version'], $matches))
|
||||
die(sprintf("skip Cannot determine MySQL Server version\n"));
|
||||
|
||||
$version = $matches[0] * 10000 + $matches[1] * 100 + $matches[2];
|
||||
if ($version < 40106)
|
||||
die(sprintf("skip Need MySQL Server 4.1.6+, found %d.%02d.%02d (%d)\n",
|
||||
$matches[0], $matches[1], $matches[2], $version));
|
||||
?>
|
||||
--FILE--
|
||||
<?php
|
||||
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
|
||||
|
||||
$attr = getenv('PDOTEST_ATTR');
|
||||
if (!$attr) {
|
||||
$attr = array();
|
||||
} else {
|
||||
$attr = unserialize($attr);
|
||||
}
|
||||
$attr[PDO::ATTR_PERSISTENT] = true;
|
||||
$attr[PDO::ATTR_EMULATE_PREPARES] = false;
|
||||
putenv('PDOTEST_ATTR='.serialize($attr));
|
||||
|
||||
$db = MySQLPDOTest::factory();
|
||||
|
||||
$stmt = $db->prepare("SELECT 1");
|
||||
$stmt->execute();
|
||||
|
||||
foreach ($stmt as $line) {
|
||||
var_dump($line);
|
||||
}
|
||||
|
||||
print "done!";
|
||||
?>
|
||||
--EXPECTF--
|
||||
array(2) {
|
||||
[1]=>
|
||||
int(1)
|
||||
[2]=>
|
||||
int(1)
|
||||
}
|
||||
done!
|
||||
@@ -0,0 +1,41 @@
|
||||
--TEST--
|
||||
Bug #61755 (A parsing bug in the prepared statements can lead to access violations)
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if (!extension_loaded('pdo') || !extension_loaded('pdo_mysql')) die('skip not loaded');
|
||||
require dirname(__FILE__) . '/config.inc';
|
||||
require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
|
||||
PDOTest::skip();
|
||||
?>
|
||||
--FILE--
|
||||
<?php
|
||||
require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
|
||||
$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
|
||||
|
||||
$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
|
||||
|
||||
echo "NULL-Byte before first placeholder:\n";
|
||||
$s = $db->prepare("SELECT \"a\0b\", ?");
|
||||
$s->bindValue(1,"c");
|
||||
$s->execute();
|
||||
$r = $s->fetch();
|
||||
echo "Length of item 0: ".strlen($r[0]).", Value of item 1: ".$r[1]."\n";
|
||||
|
||||
echo "\nOpen comment:\n";
|
||||
try {
|
||||
$s = $db->prepare("SELECT /*");
|
||||
$s->execute();
|
||||
} catch (Exception $e) {
|
||||
echo "Error code: ".$e->getCode()."\n";
|
||||
}
|
||||
|
||||
echo "\ndone!\n";
|
||||
?>
|
||||
--EXPECTF--
|
||||
NULL-Byte before first placeholder:
|
||||
Length of item 0: 3, Value of item 1: c
|
||||
|
||||
Open comment:
|
||||
Error code: 42000
|
||||
|
||||
done!
|
||||
@@ -4807,7 +4807,9 @@ PHP_FUNCTION(pg_get_notify)
|
||||
#else
|
||||
if (atof(PG_VERSION) >= 9.0) {
|
||||
#endif
|
||||
#if HAVE_PQPARAMETERSTATUS
|
||||
add_index_string(return_value, 2, pgsql_notify->extra, 1);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
if (result_type & PGSQL_ASSOC) {
|
||||
@@ -4818,7 +4820,9 @@ PHP_FUNCTION(pg_get_notify)
|
||||
#else
|
||||
if (atof(PG_VERSION) >= 9.0) {
|
||||
#endif
|
||||
#if HAVE_PQPARAMETERSTATUS
|
||||
add_assoc_string(return_value, "payload", pgsql_notify->extra, 1);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
PQfreemem(pgsql_notify);
|
||||
|
||||
+13
-3
@@ -38,7 +38,7 @@ static php_uint32 phar_tar_number(char *buf, int len) /* {{{ */
|
||||
/* }}} */
|
||||
|
||||
/* adapted from format_octal() in libarchive
|
||||
*
|
||||
*
|
||||
* Copyright (c) 2003-2009 Tim Kientzle
|
||||
* All rights reserved.
|
||||
*
|
||||
@@ -161,7 +161,7 @@ static int phar_tar_process_metadata(phar_entry_info *entry, php_stream *fp TSRM
|
||||
size_t save = php_stream_tell(fp), read;
|
||||
phar_entry_info *mentry;
|
||||
|
||||
metadata = (char *) emalloc(entry->uncompressed_filesize + 1);
|
||||
metadata = (char *) safe_emalloc(1, entry->uncompressed_filesize, 1);
|
||||
|
||||
read = php_stream_read(fp, metadata, entry->uncompressed_filesize);
|
||||
if (read != entry->uncompressed_filesize) {
|
||||
@@ -337,6 +337,16 @@ bail:
|
||||
last_was_longlink = 1;
|
||||
/* support the ././@LongLink system for storing long filenames */
|
||||
entry.filename_len = entry.uncompressed_filesize;
|
||||
|
||||
/* Check for overflow - bug 61065 */
|
||||
if (entry.filename_len == UINT_MAX) {
|
||||
if (error) {
|
||||
spprintf(error, 4096, "phar error: \"%s\" is a corrupted tar file (invalid entry size)", fname);
|
||||
}
|
||||
php_stream_close(fp);
|
||||
phar_destroy_phar_data(myphar TSRMLS_CC);
|
||||
return FAILURE;
|
||||
}
|
||||
entry.filename = pemalloc(entry.filename_len+1, myphar->is_persistent);
|
||||
|
||||
read = php_stream_read(fp, entry.filename, entry.filename_len);
|
||||
@@ -367,7 +377,7 @@ bail:
|
||||
}
|
||||
|
||||
read = php_stream_read(fp, buf, sizeof(buf));
|
||||
|
||||
|
||||
if (read != sizeof(buf)) {
|
||||
efree(entry.filename);
|
||||
if (error) {
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
[ req ]
|
||||
default_bits = 1024
|
||||
default_keyfile = privkey.pem
|
||||
distinguished_name = req_distinguished_name
|
||||
attributes = req_attributes
|
||||
x509_extensions = v3_ca # The extentions to add to the self signed cert
|
||||
string_mask = MASK:4294967295
|
||||
|
||||
|
||||
[ req_distinguished_name ]
|
||||
countryName = Country Name (2 letter code)
|
||||
countryName_default = AU
|
||||
countryName_min = 2
|
||||
countryName_max = 2
|
||||
stateOrProvinceName = State or Province Name (full name)
|
||||
stateOrProvinceName_default = Some-State
|
||||
localityName = Locality Name (eg, city)
|
||||
0.organizationName = Organization Name (eg, company)
|
||||
0.organizationName_default = Internet Widgits Pty Ltd
|
||||
organizationalUnitName = Organizational Unit Name (eg, section)
|
||||
commonName = Common Name (eg, YOUR name)
|
||||
commonName_max = 64
|
||||
emailAddress = Email Address
|
||||
emailAddress_max = 64
|
||||
|
||||
[ req_attributes ]
|
||||
challengePassword = A challenge password
|
||||
challengePassword_min = 4
|
||||
challengePassword_max = 20
|
||||
unstructuredName = An optional company name
|
||||
|
||||
[ v3_req ]
|
||||
basicConstraints = CA:FALSE
|
||||
keyUsage = nonRepudiation, digitalSignature, keyEncipherment
|
||||
|
||||
[ v3_ca ]
|
||||
subjectKeyIdentifier=hash
|
||||
authorityKeyIdentifier=keyid:always,issuer:always
|
||||
basicConstraints = CA:true
|
||||
|
||||
[ usr_cert ]
|
||||
basicConstraints=CA:FALSE
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
--TEST--
|
||||
Phar::buildFromDirectory() - non-directory passed as first parameter
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if (!extension_loaded("phar")) die("skip");
|
||||
if (substr(PHP_OS, 0, 3) != "WIN") die("skip Windows only test");
|
||||
?>
|
||||
--INI--
|
||||
phar.require_hash=0
|
||||
phar.readonly=0
|
||||
--FILE--
|
||||
<?php
|
||||
try {
|
||||
$phar = new Phar(dirname(__FILE__) . '/buildfromdirectory.phar');
|
||||
$phar->buildFromDirectory(1);
|
||||
} catch (Exception $e) {
|
||||
var_dump(get_class($e));
|
||||
echo $e->getMessage() . "\n";
|
||||
}
|
||||
?>
|
||||
===DONE===
|
||||
--CLEAN--
|
||||
<?php
|
||||
unlink(dirname(__FILE__) . '/buildfromdirectory.phar');
|
||||
__HALT_COMPILER();
|
||||
?>
|
||||
--EXPECTF--
|
||||
%s(24) "UnexpectedValueException"
|
||||
RecursiveDirectoryIterator::__construct(1,1): The system cannot find the file specified. (code: 2)
|
||||
===DONE===
|
||||
@@ -1,7 +1,10 @@
|
||||
--TEST--
|
||||
Phar::buildFromDirectory() - non-directory passed as first parameter
|
||||
--SKIPIF--
|
||||
<?php if (!extension_loaded("phar")) die("skip"); ?>
|
||||
<?php
|
||||
if (!extension_loaded("phar")) die("skip");
|
||||
if (substr(PHP_OS, 0, 3) == "WIN") die("skip not for Windows");
|
||||
?>
|
||||
--INI--
|
||||
phar.require_hash=0
|
||||
phar.readonly=0
|
||||
|
||||
@@ -34,9 +34,11 @@ var_dump($p->getSignature());
|
||||
echo $e->getMessage();
|
||||
}
|
||||
try {
|
||||
$config = dirname(__FILE__) . '/files/openssl.cnf';
|
||||
$config_arg = array('config' => $config);
|
||||
$private = openssl_get_privatekey(file_get_contents(dirname(__FILE__) . '/files/private.pem'));
|
||||
$pkey = '';
|
||||
openssl_pkey_export($private, $pkey);
|
||||
openssl_pkey_export($private, $pkey, NULL, $config_arg);
|
||||
$p->setSignatureAlgorithm(Phar::OPENSSL, $pkey);
|
||||
var_dump($p->getSignature());
|
||||
} catch (Exception $e) {
|
||||
|
||||
@@ -5,6 +5,9 @@ Phar::setStub()/stopBuffering() tar-based
|
||||
--INI--
|
||||
phar.require_hash=0
|
||||
phar.readonly=0
|
||||
--ENV--
|
||||
TEMP=.
|
||||
TMP=.
|
||||
--FILE--
|
||||
<?php
|
||||
$p = new Phar(dirname(__FILE__) . '/brandnewphar.phar.tar', 0, 'brandnewphar.phar');
|
||||
@@ -41,4 +44,4 @@ include 'phar://brandnewphar.phar/startup.php';
|
||||
__HALT_COMPILER(); ?>
|
||||
"
|
||||
bool(true)
|
||||
===DONE===
|
||||
===DONE===
|
||||
@@ -32,9 +32,11 @@ var_dump($p->getSignature());
|
||||
echo $e->getMessage();
|
||||
}
|
||||
try {
|
||||
$config = dirname(__FILE__) . '/../files/openssl.cnf';
|
||||
$config_arg = array('config' => $config);
|
||||
$private = openssl_get_privatekey(file_get_contents(dirname(dirname(__FILE__)) . '/files/private.pem'));
|
||||
$pkey = '';
|
||||
openssl_pkey_export($private, $pkey);
|
||||
openssl_pkey_export($private, $pkey, NULL, $config_arg);
|
||||
$p->setSignatureAlgorithm(Phar::OPENSSL, $pkey);
|
||||
var_dump($p->getSignature());
|
||||
} catch (Exception $e) {
|
||||
|
||||
@@ -5,6 +5,9 @@ Phar::setStub()/stopBuffering() zip-based
|
||||
--INI--
|
||||
phar.require_hash=0
|
||||
phar.readonly=0
|
||||
--ENV--
|
||||
TEMP=.
|
||||
TMP=.
|
||||
--FILE--
|
||||
<?php
|
||||
$p = new Phar(dirname(__FILE__) . '/brandnewphar.phar.zip', 0, 'brandnewphar.phar');
|
||||
@@ -41,4 +44,4 @@ include 'phar://brandnewphar.phar/startup.php';
|
||||
__HALT_COMPILER(); ?>
|
||||
"
|
||||
bool(true)
|
||||
===DONE===
|
||||
===DONE===
|
||||
@@ -49,8 +49,10 @@ var_dump($p->getSignature());
|
||||
echo $e->getMessage();
|
||||
}
|
||||
try {
|
||||
$keys=openssl_pkey_new();
|
||||
openssl_pkey_export($keys, $privkey);
|
||||
$config = dirname(__FILE__) . '/../files/openssl.cnf';
|
||||
$config_arg = array('config' => $config);
|
||||
$keys=openssl_pkey_new($config_arg);
|
||||
openssl_pkey_export($keys, $privkey, NULL, $config_arg);
|
||||
$pubkey=openssl_pkey_get_details($keys);
|
||||
$p->setSignatureAlgorithm(Phar::OPENSSL, $privkey);
|
||||
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
--TEST--
|
||||
Bug #42596 (session.save_path MODE option will not set "write" bit for group or world)
|
||||
--SKIPIF--
|
||||
<?php include('skipif.inc'); ?>
|
||||
<?php
|
||||
if(substr(PHP_OS, 0, 3) == "WIN") die("skip not for Windows");
|
||||
include('skipif.inc');
|
||||
?>
|
||||
--INI--
|
||||
session.use_cookies=0
|
||||
session.cache_limiter=
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
--TEST--
|
||||
Bug #31422 (No Error-Logging on SoapServer-Side)
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if (substr(PHP_OS, 0, 3) != 'WIN') {
|
||||
die('skip not valid for non windows');
|
||||
}
|
||||
require_once('skipif.inc');
|
||||
?>
|
||||
--INI--
|
||||
log_errors=1
|
||||
--FILE--
|
||||
<?php
|
||||
function Add($x,$y) {
|
||||
fopen();
|
||||
user_error("Hello", E_USER_ERROR);
|
||||
return $x+$y;
|
||||
}
|
||||
|
||||
$server = new SoapServer(null,array('uri'=>"http://testuri.org"));
|
||||
$server->addfunction("Add");
|
||||
|
||||
$HTTP_RAW_POST_DATA = <<<EOF
|
||||
<?xml version="1.0" encoding="ISO-8859-1"?>
|
||||
<SOAP-ENV:Envelope
|
||||
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
|
||||
xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
|
||||
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xmlns:si="http://soapinterop.org/xsd">
|
||||
<SOAP-ENV:Body>
|
||||
<ns1:Add xmlns:ns1="http://testuri.org">
|
||||
<x xsi:type="xsd:int">22</x>
|
||||
<y xsi:type="xsd:int">33</y>
|
||||
</ns1:Add>
|
||||
</SOAP-ENV:Body>
|
||||
</SOAP-ENV:Envelope>
|
||||
EOF;
|
||||
|
||||
$server->handle($HTTP_RAW_POST_DATA);
|
||||
echo "ok\n";
|
||||
?>
|
||||
--EXPECTF--
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Hello</faultstring></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
|
||||
PHP Warning: fopen() expects at least 2 parameters, 0 given in %sbug31422-win.php on line %d
|
||||
PHP Fatal error: Hello in %sbug31422-win.php on line %d
|
||||
@@ -1,7 +1,12 @@
|
||||
--TEST--
|
||||
Bug #31422 (No Error-Logging on SoapServer-Side)
|
||||
--SKIPIF--
|
||||
<?php require_once('skipif.inc'); ?>
|
||||
<?php
|
||||
if (substr(PHP_OS, 0, 3) == 'WIN') {
|
||||
die('skip not valid for windows');
|
||||
}
|
||||
require_once('skipif.inc');
|
||||
?>
|
||||
--INI--
|
||||
log_errors=1
|
||||
--FILE--
|
||||
|
||||
@@ -8,7 +8,7 @@ SOAP Server 19: compressed request (gzip)
|
||||
?>
|
||||
--INI--
|
||||
precision=14
|
||||
--POST--
|
||||
--GZIP_POST--
|
||||
<SOAP-ENV:Envelope
|
||||
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
|
||||
xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
|
||||
@@ -19,8 +19,6 @@ precision=14
|
||||
<ns1:test xmlns:ns1="http://testuri.org" />
|
||||
</SOAP-ENV:Body>
|
||||
</SOAP-ENV:Envelope>
|
||||
--GZIP_POST--
|
||||
1
|
||||
--FILE--
|
||||
<?php
|
||||
function test() {
|
||||
|
||||
@@ -8,7 +8,7 @@ SOAP Server 20: compressed request (deflate)
|
||||
?>
|
||||
--INI--
|
||||
precision=14
|
||||
--POST--
|
||||
--DEFLATE_POST--
|
||||
<?xml version="1.0" encoding="ISO-8859-1"?>
|
||||
<SOAP-ENV:Envelope
|
||||
SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
|
||||
@@ -20,8 +20,6 @@ precision=14
|
||||
<ns1:test xmlns:ns1="http://testuri.org" />
|
||||
</SOAP-ENV:Body>
|
||||
</SOAP-ENV:Envelope>
|
||||
--DEFLATE_POST--
|
||||
1
|
||||
--FILE--
|
||||
<?php
|
||||
function test() {
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
--TEST--
|
||||
Test if socket binds on 31338
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if (substr(PHP_OS, 0, 3) != 'WIN') {
|
||||
die('skip.. Not valid for non Windows');
|
||||
}
|
||||
if (!extension_loaded('sockets')) {
|
||||
die('SKIP The sockets extension is not loaded.');
|
||||
}
|
||||
--FILE--
|
||||
<?php
|
||||
$sock = socket_create_listen(31338);
|
||||
socket_getsockname($sock, $addr, $port);
|
||||
var_dump($addr, $port);
|
||||
--EXPECT--
|
||||
string(9) "127.0.0.1"
|
||||
int(31338)
|
||||
--CREDITS--
|
||||
Till Klampaeckel, till@php.net
|
||||
PHP Testfest Berlin 2009-05-09
|
||||
@@ -2,6 +2,9 @@
|
||||
Test if socket binds on 31338
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if (substr(PHP_OS, 0, 3) == 'WIN') {
|
||||
die('skip.. Not valid for Windows');
|
||||
}
|
||||
if (!extension_loaded('sockets')) {
|
||||
die('SKIP The sockets extension is not loaded.');
|
||||
}
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
--TEST--
|
||||
Test parameter handling in socket_create_pair()
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if (substr(PHP_OS, 0, 3) != 'WIN') {
|
||||
die('skip.. Not valid for non Windows');
|
||||
}
|
||||
if (!extension_loaded('sockets')) {
|
||||
die('SKIP The sockets extension is not loaded.');
|
||||
}
|
||||
--FILE--
|
||||
<?php
|
||||
var_dump(socket_create_pair(AF_INET, null, null));
|
||||
|
||||
$domain = 'unknown';
|
||||
var_dump(socket_create_pair($domain, SOCK_STREAM, 0, $sockets));
|
||||
|
||||
var_dump(socket_create_pair(AF_INET, null, null, $sockets));
|
||||
|
||||
var_dump(socket_create_pair(31337, null, null, $sockets));
|
||||
|
||||
var_dump(socket_create_pair(AF_INET, 31337, 0, $sockets));
|
||||
--EXPECTF--
|
||||
Warning: socket_create_pair() expects exactly 4 parameters, 3 given in %s on line %d
|
||||
NULL
|
||||
|
||||
Warning: socket_create_pair() expects parameter 1 to be long, %unicode_string_optional% given in %s on line %d
|
||||
NULL
|
||||
bool(true)
|
||||
|
||||
Warning: socket_create_pair(): invalid socket domain [31337] specified for argument 1, assuming AF_INET in %s on line %d
|
||||
bool(true)
|
||||
|
||||
Warning: socket_create_pair(): invalid socket type [31337] specified for argument 2, assuming SOCK_STREAM in %s on line %d
|
||||
bool(true)
|
||||
--CREDITS--
|
||||
Till Klampaeckel, till@php.net
|
||||
Berlin TestFest 2009
|
||||
@@ -2,6 +2,9 @@
|
||||
Test parameter handling in socket_create_pair()
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if (substr(PHP_OS, 0, 3) == 'WIN') {
|
||||
die('skip.. Not valid for Windows');
|
||||
}
|
||||
if (!extension_loaded('sockets')) {
|
||||
die('SKIP The sockets extension is not loaded.');
|
||||
}
|
||||
|
||||
@@ -2,6 +2,9 @@
|
||||
Test parameter handling in socket_listen().
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if (substr(PHP_OS, 0, 3) == 'WIN') {
|
||||
die('skip.. Not valid for Windows');
|
||||
}
|
||||
if (!extension_loaded('sockets')) {
|
||||
die('SKIP The sockets extension is not loaded.');
|
||||
}
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
--TEST--
|
||||
Test parameter handling in socket_select().
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if (substr(PHP_OS, 0, 3) != 'WIN') {
|
||||
die('skip.. Not valid for non Windows');
|
||||
}
|
||||
if (!extension_loaded('sockets')) {
|
||||
die('SKIP The sockets extension is not loaded.');
|
||||
}
|
||||
--FILE--
|
||||
<?php
|
||||
$sockets = array();
|
||||
$domain = AF_INET;
|
||||
socket_create_pair($domain, SOCK_STREAM, 0, $sockets);
|
||||
|
||||
$write = null;
|
||||
$except = null;
|
||||
$time = -1;
|
||||
var_dump(socket_select($sockets, $write, $except, $time));
|
||||
--EXPECTF--
|
||||
int(0)
|
||||
--CREDITS--
|
||||
Till Klampaeckel, till@php.net
|
||||
Berlin TestFest 2009
|
||||
@@ -2,17 +2,16 @@
|
||||
Test parameter handling in socket_select().
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if (substr(PHP_OS, 0, 3) == 'WIN') {
|
||||
die('skip.. Not valid for Windows');
|
||||
}
|
||||
if (!extension_loaded('sockets')) {
|
||||
die('SKIP The sockets extension is not loaded.');
|
||||
}
|
||||
--FILE--
|
||||
<?php
|
||||
$sockets = array();
|
||||
if (strtolower(substr(PHP_OS, 0, 3)) == 'win') {
|
||||
$domain = AF_INET;
|
||||
} else {
|
||||
$domain = AF_UNIX;
|
||||
}
|
||||
$domain = AF_UNIX;
|
||||
socket_create_pair($domain, SOCK_STREAM, 0, $sockets);
|
||||
|
||||
$write = null;
|
||||
|
||||
@@ -2,6 +2,9 @@
|
||||
Test if socket_recvfrom() receives data sent by socket_sendto() through a Unix domain socket
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if (substr(PHP_OS, 0, 3) == 'WIN') {
|
||||
die('skip.. Not valid for Windows');
|
||||
}
|
||||
if (!extension_loaded('sockets')) {
|
||||
die('SKIP The sockets extension is not loaded.');
|
||||
}
|
||||
|
||||
@@ -2,6 +2,9 @@
|
||||
Unix domain socket Loopback test
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if (substr(PHP_OS, 0, 3) == 'WIN') {
|
||||
die('skip.. Not valid for Windows');
|
||||
}
|
||||
if (!extension_loaded('sockets')) {
|
||||
die('skip sockets extension not available.');
|
||||
}
|
||||
|
||||
@@ -271,7 +271,18 @@ static void spl_filesystem_dir_open(spl_filesystem_object* intern, char *path TS
|
||||
|
||||
static int spl_filesystem_file_open(spl_filesystem_object *intern, int use_include_path, int silent TSRMLS_DC) /* {{{ */
|
||||
{
|
||||
zval tmp;
|
||||
|
||||
intern->type = SPL_FS_FILE;
|
||||
|
||||
php_stat(intern->file_name, intern->file_name_len, FS_IS_DIR, &tmp TSRMLS_CC);
|
||||
if (Z_LVAL(tmp)) {
|
||||
intern->u.file.open_mode = NULL;
|
||||
intern->file_name = NULL;
|
||||
zend_throw_exception_ex(spl_ce_LogicException, 0 TSRMLS_CC, "Cannot use SplFileObject with directories");
|
||||
return FAILURE;
|
||||
}
|
||||
|
||||
intern->u.file.context = php_stream_context_from_zval(intern->u.file.zcontext, 0);
|
||||
intern->u.file.stream = php_stream_open_wrapper_ex(intern->file_name, intern->u.file.open_mode, (use_include_path ? USE_PATH : 0) | ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL, intern->u.file.context);
|
||||
|
||||
|
||||
@@ -17,9 +17,12 @@ class VariableStream {
|
||||
var $varname;
|
||||
|
||||
function stream_open($path, $mode, $options, &$opened_path)
|
||||
{
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
function url_stat() {
|
||||
}
|
||||
}
|
||||
stream_wrapper_register("SPLtest", "VariableStream");
|
||||
$ftruncate_test = "";
|
||||
|
||||
@@ -12,6 +12,9 @@ class VariableStream {
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
function url_stat() {
|
||||
}
|
||||
}
|
||||
stream_wrapper_register("SPLtest", "VariableStream");
|
||||
$ftruncate_test = "";
|
||||
|
||||
Loaded 100 of 181 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user