clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 06:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
78,580 Commits 494 Branches 1,367 Tags 800 MiB
843423716b
Commit Graph

33500 Commits

Author SHA1 Message Date
Xinchen Hui
8b72df0608 Merge branch 'PHP-5.6' 2013-12-30 10:58:56 +08:00
Xinchen Hui
31d4d11432 Fix one more test in dos style eol 2013-12-30 10:58:40 +08:00
Xinchen Hui
f204df9a7f Merge branch 'PHP-5.5' into PHP-5.6 2013-12-30 10:58:23 +08:00
Xinchen Hui
6699b1f8ea Fix dos style eol in phpts 2013-12-30 10:58:01 +08:00
Xinchen Hui
408ae9a452 Merge branch 'PHP-5.6' 2013-12-30 10:52:21 +08:00
Xinchen Hui
a88543a106 Fixed bug #66298 (ext/opcache/Optimizer/zend_optimizer.c has dos-style ^M as lineend) 2013-12-30 10:51:47 +08:00
Xinchen Hui
04c8ce259f Fixed bug #66298 (ext/opcache/Optimizer/zend_optimizer.c has dos-style ^M as lineend) 
Use git blame -w to ingore the space changes
 2013-12-30 10:50:46 +08:00
Remi Collet
bd3e5aab1d Merge branch 'PHP-5.6' 
* PHP-5.6:
  minor fix on previous
 2013-12-28 14:29:38 +01:00
Remi Collet
809eb77689 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  minor fix on previous
 2013-12-28 14:29:27 +01:00
Remi Collet
464c219ed4 minor fix on previous 2013-12-28 14:29:14 +01:00
Remi Collet
8785e22bca Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop())
 2013-12-28 14:26:24 +01:00
Remi Collet
46809869a3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop())
 2013-12-28 14:26:06 +01:00
Remi Collet
8f4a5373bb Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop()) 
Initial fix was PHP stuff
This one is libgd fix.

- filter invalid crop size
- dont try to copy on invalid position
- fix crop size when out of src image
- fix possible NULL deref
- fix possible integer overfloow
 2013-12-28 14:22:13 +01:00
Xinchen Hui
1a4863d560 Merge branch 'PHP-5.6' 2013-12-27 14:07:15 +08:00
Xinchen Hui
04a52443e7 Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	main/php_version.h
 2013-12-27 14:06:35 +08:00
Xinchen Hui
2938329ce1 Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop()) 
And also fixed the bug: arguments are altered after some calls
 2013-12-27 14:04:59 +08:00
Dmitry Stogov
65fd18fd88 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Improved empty string handling. Now ZE uses an interned string instead of allocation new empty string each time. (Some extensions might need to be fixed using str_efree() instead of efree() to support interned strings).

Conflicts:
	NEWS
	Zend/zend_extensions.h
	Zend/zend_modules.h
 2013-12-26 14:51:05 +04:00
Dmitry Stogov
03a37de9b3 Improved empty string handling. Now ZE uses an interned string instead of allocation new empty string each time. (Some extensions might need to be fixed using str_efree() instead of efree() to support interned strings). 2013-12-26 14:47:13 +04:00
Anatol Belski
734c28d242 Merge branch 'PHP-5.6' 
* PHP-5.6:
  brought the ext/sybase_ct/config.w32 up to date
 2013-12-25 23:31:17 +01:00
Anatol Belski
9f9179cc62 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  brought the ext/sybase_ct/config.w32 up to date
 2013-12-25 23:30:59 +01:00
Anatol Belski
5b0620831c brought the ext/sybase_ct/config.w32 up to date 2013-12-25 23:29:42 +01:00
Xinchen Hui
03e36cd5b8 Merge branch 'PHP-5.6' 2013-12-25 15:35:02 +08:00
Xinchen Hui
d316040857 Fix test 2013-12-25 15:34:39 +08:00
Joe Watkins
ca8ff0725b update credits 2013-12-24 09:04:32 +00:00
Joe Watkins
e538c1ad3f update credits headers 2013-12-24 09:03:22 +00:00
Dmitry Stogov
67eccf8617 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66338 (Optimization binding of class constants is not safely opcacheable)
 2013-12-23 16:54:54 +04:00
Dmitry Stogov
a00e7f22d2 Fixed bug #66338 (Optimization binding of class constants is not safely opcacheable) 2013-12-23 16:53:34 +04:00
Dmitry Stogov
209ec406ca Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66334 (Memory Leak in new pass1_5.c optimizations). (Terry)
 2013-12-23 16:05:18 +04:00
Dmitry Stogov
ccb29a6e41 Fixed bug #66334 (Memory Leak in new pass1_5.c optimizations). (Terry) 2013-12-23 16:04:10 +04:00
Dmitry Stogov
62fa84a031 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Added suggestion about opcache.revalidate_freq setting in development environment
 2013-12-23 13:11:22 +04:00
Dmitry Stogov
8650d2dda6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Added suggestion about opcache.revalidate_freq setting in development environment
 2013-12-23 13:10:42 +04:00
Dmitry Stogov
f7b6db7555 Added suggestion about opcache.revalidate_freq setting in development environment 2013-12-23 13:09:45 +04:00
Dmitry Stogov
5bc9e006e8 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed Issue #140: "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq"
  fix news
  opcodes
  opcodes

Conflicts:
	NEWS
 2013-12-23 12:52:27 +04:00
Dmitry Stogov
f5c200fce9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed Issue #140: "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq"
  opcodes
 2013-12-23 12:50:42 +04:00
Dmitry Stogov
0dcaf0f445 Fixed Issue #140: "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq" 2013-12-23 12:46:30 +04:00
krakjoe
2a1b60569f Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  stop warnings from unused opcode map
  - BFN
  - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
  Included new .c file in build too
  Fixed little typo in zend_vm_gen.php
  Moved to new file, killing a lot of warnings
 2013-12-22 13:11:20 +00:00
Felipe Pena
e700cbff22 Merge branch 'PHP-5.6' 
* PHP-5.6:
  - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
 2013-12-22 09:43:29 -02:00
Felipe Pena
9f1075bb29 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
 2013-12-22 09:43:10 -02:00
Felipe Pena
8e36d36ee6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
 2013-12-22 09:42:58 -02:00
Felipe Pena
a056113586 - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com 2013-12-22 09:42:45 -02:00
Christopher Jones
794df91c35 Align 'configure --help' columns 2013-12-20 10:02:46 -08:00
Bob Weinand
f500be8838 Merge branch 'PHP-5.6' 2013-12-20 14:35:40 +01:00
Boris Lytochkin
285c0bcec0 Merge branch '5.5' into 5.6 
* 5.5:
  Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytochkin)
  Fixed SNMP_ERR_TOOBIG handling for bulk walk operations
 2013-12-20 00:39:15 +04:00
Boris Lytochkin
b65bd30e89 Merge branch '5.4' into 5.5 
* 5.4:
  Fixed SNMP_ERR_TOOBIG handling for bulk walk operations
 2013-12-20 00:26:34 +04:00
Boris Lytochkin
bb51d0e4c0 Fixed SNMP_ERR_TOOBIG handling for bulk walk operations 2013-12-20 00:25:16 +04:00
Derick Rethans
d4f4b66d43 Merge branch 'PHP-5.5' into PHP-5.6 2013-12-19 19:01:00 +00:00
Derick Rethans
7a402ca51e Merge branch 'PHP-5.4' into PHP-5.5 2013-12-19 18:58:45 +00:00
Derick Rethans
e881334e49 - Updated to version 2013.9 (2013i) 2013-12-19 18:58:44 +00:00
Remi Collet
f6ffecbd2d save a few memory 2013-12-19 10:55:26 +01:00
Remi Collet
99b91f98b1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
 2013-12-19 10:54:06 +01:00
Remi Collet
32d1d5fb59 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
 2013-12-19 10:53:50 +01:00
Remi Collet
20eb8e4d11 Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real) 2013-12-19 10:53:38 +01:00
Bob Weinand
b11b3d201f Fixed ZTS build. Needed to bump API version number. 2013-12-18 16:44:20 +01:00
Dmitry Stogov
26096aa73f Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed reavlidate_path=1 behavior to avoid caching of symlinks values.
 2013-12-18 19:22:05 +04:00
Dmitry Stogov
436ca2d019 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed reavlidate_path=1 behavior to avoid caching of symlinks values.

Conflicts:
	NEWS
 2013-12-18 19:21:21 +04:00
Dmitry Stogov
16e95d9137 Fixed reavlidate_path=1 behavior to avoid caching of symlinks values. 2013-12-18 19:19:53 +04:00
Kalle Sommer Nielsen
aed4b086ac Eliminate the TSRMLS_FETCH() calls in the ticks functions and hook 2013-12-18 09:32:26 +01:00
Kalle Sommer Nielsen
c83598119b Kill a TSRMLS_FETCH() in php_stream_context_set() by passing TSRMLS_CC to it 
# For mysqlnd: Relevant PHP_API_VERSION are put in place for cross version compatibility
 2013-12-18 09:19:24 +01:00
Kalle Sommer Nielsen
2eb9bd316d Merge branch 'master' of https://git.php.net/push/php-src 2013-12-18 07:27:14 +01:00
Kalle Sommer Nielsen
d14670ccdb Eliminate another TSRMLS_FETCH() in i_zend_is_true() 
# Affected extensions have all been updated, ext/opcache and ext/zip
# both have macros for cross version compatibility
 2013-12-18 07:25:05 +01:00
Anatol Belski
c0f1e6946d Merge branch 'PHP-5.6' 
* PHP-5.6:
  fixed possibly uninitialized value usage
 2013-12-17 08:45:49 +01:00
Anatol Belski
beed28844b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fixed possibly uninitialized value usage
 2013-12-17 08:45:30 +01:00
Anatol Belski
5e5ecaea6e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed possibly uninitialized value usage
 2013-12-17 08:45:07 +01:00
Anatol Belski
2303d0ea22 fixed possibly uninitialized value usage 2013-12-17 08:44:22 +01:00
Xinchen Hui
a9c503bc27 Merge branch 'PHP-5.6' 2013-12-17 15:10:56 +08:00
Xinchen Hui
eeb37c40e6 Save one char compare 2013-12-17 15:09:52 +08:00
Xinchen Hui
ac719610f4 Merge branch 'PHP-5.6' 2013-12-17 15:06:36 +08:00
Xinchen Hui
143ae34f29 Fixed test failed after rev 57c1335f 2013-12-17 15:05:31 +08:00
Stanislav Malyshev
5613d70ee8 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #65873 - Integer overflow in exif_read_data()
 2013-12-16 11:38:00 -08:00
Stanislav Malyshev
de4a2c3cbd Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #65873 - Integer overflow in exif_read_data()
 2013-12-16 11:37:29 -08:00
Stanislav Malyshev
57408f9c85 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #65873 - Integer overflow in exif_read_data()
 2013-12-16 11:36:33 -08:00
Stanislav Malyshev
cbcf6e1880 Fix bug #65873 - Integer overflow in exif_read_data() 2013-12-16 11:34:24 -08:00
Dmitry Stogov
a67c615799 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:php-src:
  Fix tests expecting specific resource IDs
  fixed parameter order for zend_throw_exception_ex call
  Fix doc (svn -> git)
  Updated release process
 2013-12-16 13:13:29 +04:00
Dmitry Stogov
43f11165b8 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 
* 'PHP-5.6' of git.php.net:php-src:
  Fix tests expecting specific resource IDs
  fixed parameter order for zend_throw_exception_ex call
  Fix doc (svn -> git)
  Test pushing
  Updated release process
 2013-12-16 13:13:18 +04:00
Dmitry Stogov
82d67af60d Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  Fix tests expecting specific resource IDs
  fixed parameter order for zend_throw_exception_ex call
  Fix doc (svn -> git)
  Fix tests expecting specific resource IDs
  Test pushing
  Updated release process
 2013-12-16 13:12:55 +04:00
Xinchen Hui
5eb8d9d700 Merge branch 'PHP-5.6' of https://git.php.net/push/php-src into PHP-5.6 2013-12-15 16:55:29 +08:00
Xinchen Hui
7cf6f012b1 Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5 2013-12-15 16:55:11 +08:00
Xinchen Hui
10964b7854 Merge branch 'PHP-5.5' into PHP-5.6 2013-12-15 16:51:32 +08:00
Eric Stenson
330168a247 Fix tests expecting specific resource IDs 
When Wincache or APC are installed, the resource IDs are not the same.
This is because Wincache takes a few resource objects for itself.  As a
result, these tests become false positives.

On Windows boxes, the microtime precision is not granular enough
to reliably register a difference if two calls to uniqid() are made
concurrently.  This is a fix to the uniqid() test to avoid the false
positive when run on Windows machines.  Also, added a test to exercise
the 'more_entropy' variant of uniqid().
 2013-12-15 16:51:21 +08:00
Xinchen Hui
304d97933f Merge branch 'issue-phpt-resourceid-wincache' of https://github.com/EricSten/php-src 2013-12-15 16:26:11 +08:00
Anatol Belski
fc4761a07c Merge branch 'PHP-5.6' 
* PHP-5.6:
  fixed parameter order for zend_throw_exception_ex call
  Fix doc (svn -> git)
  Test pushing
 2013-12-14 20:48:44 +01:00
Anatol Belski
904721189f Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fixed parameter order for zend_throw_exception_ex call
  Fix doc (svn -> git)
 2013-12-14 20:47:37 +01:00
Anatol Belski
509a67d28f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed parameter order for zend_throw_exception_ex call
  Fix doc (svn -> git)
 2013-12-14 20:46:43 +01:00
Anatol Belski
68a73ce3c4 fixed parameter order for zend_throw_exception_ex call 2013-12-14 20:43:02 +01:00
Eric Stenson
50377b5bf2 Fix tests expecting specific resource IDs 
When Wincache or APC are installed, the resource IDs are not the same.
This is because Wincache takes a few resource objects for itself.  As a
result, these tests become false positives.

On Windows boxes, the microtime precision is not granular enough
to reliably register a difference if two calls to uniqid() are made
concurrently.  This is a fix to the uniqid() test to avoid the false
positive when run on Windows machines.  Also, added a test to exercise
the 'more_entropy' variant of uniqid().
 2013-12-13 10:42:32 -08:00
Dmitry Stogov
af66b20781 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 
* 'PHP-5.6' of git.php.net:php-src:
  Use zend_error_noreturn here
  OCI8 build change: Fix source variable definition for C89 compatibility
  Add Tests for #65784 in 5.5
  Disallowed JMP into a finally block.
  Update NEWS for 5.5.7 release
  Fixed bug #65784 (Segfault with finally).
 2013-12-13 11:17:50 +04:00
Dmitry Stogov
9b829c92b5 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  Use zend_error_noreturn here
  OCI8 build change: Fix source variable definition for C89 compatibility
  Kill another TSRMLS_FETCH() in zend_indent()
  Eliminate another straight forward TSRMLS_FETCH() in zend_startup_module()
  Fix build
  Add Tests for #65784 in 5.5
  Disallowed JMP into a finally block.
  Update NEWS for 5.5.7 release
  Fixed bug #65784 (Segfault with finally).
 2013-12-13 11:15:38 +04:00
Christopher Jones
bc748ba38c OCI8 build change: Fix source variable definition for C89 compatibility 2013-12-12 15:22:55 -08:00
Kalle Sommer Nielsen
0fc8e6af0a Eliminate another straight forward TSRMLS_FETCH() in zend_startup_module() 
# For THTTPD:
# The code that uses a call to this function is for older versions of PHP anyway so its not covered

# For Zend OpCache:
# Added a new define for 5.6 and wrapped the code around that so its still compatible with older version
 2013-12-12 20:30:45 +01:00
Dmitry Stogov
711d8c2c7b Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:php-src:
  fix test
 2013-12-12 16:46:49 +04:00
Dmitry Stogov
3bddcc13b5 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 
* 'PHP-5.6' of git.php.net:php-src:
  fix test
 2013-12-12 16:46:37 +04:00
Dmitry Stogov
fd4a7388d7 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  fix test
 2013-12-12 16:46:15 +04:00
Michael Wallner
c0e87e9bb1 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix test
 2013-12-12 12:10:08 +01:00
Michael Wallner
1dfbe99ce4 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix test
 2013-12-12 12:09:54 +01:00
Michael Wallner
8ee6fe9856 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix test
 2013-12-12 12:09:34 +01:00
Michael Wallner
c59f3184a3 fix test 2013-12-12 12:08:50 +01:00
Dmitry Stogov
47f41385e1 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:php-src:
  Fixed bug #65486 mysqli_poll() is broken on Win x64
 2013-12-12 14:00:03 +04:00
Dmitry Stogov
463dbc3490 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 
* 'PHP-5.6' of git.php.net:php-src:
  Fixed bug #65486 mysqli_poll() is broken on Win x64
 2013-12-12 13:59:51 +04:00
Dmitry Stogov
a23bcba875 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  Fixed bug #65486 mysqli_poll() is broken on Win x64
 2013-12-12 13:59:37 +04:00
Dmitry Stogov
8738e6d86f Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed tests
  Fixed ext/soap/tests/bugs/bug54911.phpt
 2013-12-12 13:55:42 +04:00
Dmitry Stogov
9850d57fd9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed tests
  Fixed ext/soap/tests/bugs/bug54911.phpt
 2013-12-12 13:55:23 +04:00
Anatol Belski
58b754ca4a Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #65486 mysqli_poll() is broken on Win x64
 2013-12-12 10:46:36 +01:00
Anatol Belski
39a2dcdeac Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #65486 mysqli_poll() is broken on Win x64
 2013-12-12 10:46:21 +01:00
Dmitry Stogov
0344e6a429 Fixed tests 2013-12-12 13:35:37 +04:00
Anatol Belski
da62fd5ed8 Fixed bug #65486 mysqli_poll() is broken on Win x64 
While this issue is visible in mysqli_poll() functions, the cause
lays deeper in the stream to socket casting API. On Win x64 the
SOCKET datatype is a 64 or 32 bit unsigned, while on Linux/Unix-like
it's 32 bit signed integer. The game of casting 32 bit var to/from
64 bit pointer back and forth is the best way to break it.

Further more, while socket and file descriptors are always integers
on Linux, those are different things using different APIs on Windows.
Even though using integer instead of SOCKET might work on Windows, this
issue might need to be revamped more carefully later. By this time
this patch is tested well with phpt and apps and shows no regressions,
neither in mysqli_poll() nor in any other parts.
 2013-12-12 10:17:01 +01:00
Dmitry Stogov
1886292ec9 Fixed ext/soap/tests/bugs/bug54911.phpt 2013-12-12 13:02:50 +04:00
Adam Harvey
b97156113e Merge branch 'PHP-5.6' 
* PHP-5.6:
  Switch to using freetype-config for freetype detection.
 2013-12-07 19:42:00 -08:00
Anatol Belski
fa1802381f Merge branch 'PHP-5.6' 
* PHP-5.6:
  added missing prototype
 2013-12-11 14:16:22 +01:00
Anatol Belski
f0cf312d8c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  added missing prototype
 2013-12-11 14:16:07 +01:00
Anatol Belski
edf601a41f added missing prototype 2013-12-11 14:15:40 +01:00
Anatol Belski
2f707bf246 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix dir separator in cve-2013-6420 test
 2013-12-11 13:33:59 +01:00
Anatol Belski
e9efc16660 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix dir separator in cve-2013-6420 test
 2013-12-11 13:33:37 +01:00
Anatol Belski
b6bcae5c10 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix dir separator in cve-2013-6420 test
 2013-12-11 13:33:16 +01:00
Anatol Belski
ff89066b3d Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fix dir separator in cve-2013-6420 test
 2013-12-11 13:32:49 +01:00
Anatol Belski
6f739318fd fix dir separator in cve-2013-6420 test 2013-12-11 13:31:29 +01:00
Stanislav Malyshev
35b8f57906 Merge branch 'PHP-5.6' 
* PHP-5.6:
  5.3.29-dev
  Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
 2013-12-10 11:36:33 -08:00
Stanislav Malyshev
293984ac33 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  5.3.29-dev
  Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
 2013-12-10 11:36:06 -08:00
Stanislav Malyshev
41cd533298 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  5.3.29-dev
  Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
 2013-12-10 11:35:26 -08:00
Stanislav Malyshev
b1b23abc86 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 
* 'PHP-5.4' of git.php.net:php-src:
  Fixed Bug #66218 zend_register_functions breaks reflection
 2013-12-10 11:34:45 -08:00
Stanislav Malyshev
71daf3229b Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  5.3.29-dev
  Fix CVE-2013-6420 - memory corruption in openssl_x509_parse

Conflicts:
	configure.in
	main/php_version.h
 2013-12-10 11:34:35 -08:00
Stanislav Malyshev
c1224573c7 Fix CVE-2013-6420 - memory corruption in openssl_x509_parse 2013-12-10 11:03:49 -08:00
Remi Collet
8e29235b6c Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  Fixed Bug #66218 zend_register_functions breaks reflection
 2013-12-10 16:10:48 +01:00
Remi Collet
45d8802441 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  Fixed Bug #66218 zend_register_functions breaks reflection
 2013-12-10 16:10:20 +01:00
Remi Collet
9f4d1ee51c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed Bug #66218 zend_register_functions breaks reflection
 2013-12-10 16:09:41 +01:00
Remi Collet
3e963f8eb4 Fixed Bug #66218 zend_register_functions breaks reflection 
Functions registered using zend_register_functions instead of zend_module_entry.functions are not seen on reflection.

Ex: additional_functions from api_module_entry.
Ex: in CLI, dl, cli_set_process_title and cli_get_process_title

Note:
- also affects functions overrided in extension
  (should be be reported in extension, where overrided, not in original extension)
- also allow extension to call zend_register_functions for various list
  (instead of having a single bug list)
 2013-12-10 16:07:16 +01:00
Dmitry Stogov
ad4f0c7812 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66112 (Use after free condition in SOAP extension). (martin dot koegler at brz dot gv dot at)
 2013-12-10 17:59:20 +04:00
Dmitry Stogov
fe93347ba0 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66112 (Use after free condition in SOAP extension). (martin dot koegler at brz dot gv dot at)

Conflicts:
	NEWS
 2013-12-10 17:58:22 +04:00
Dmitry Stogov
552e8b2b4c Fixed bug #66112 (Use after free condition in SOAP extension). (martin dot koegler at brz dot gv dot at) 2013-12-10 17:57:05 +04:00
Dmitry Stogov
d439b3970a Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66251 (Constants get statically bound at compile time when Optimized)
 2013-12-10 17:05:23 +04:00
Dmitry Stogov
73f13f439b Fixed bug #66251 (Constants get statically bound at compile time when Optimized) 2013-12-10 17:04:17 +04:00
Dmitry Stogov
6b6a4e466a Merge branch 'PHP-5.6' 
* PHP-5.6:
  Arguments passed to user function have to be properly allocated on heap
 2013-12-10 13:03:24 +04:00
Dmitry Stogov
5ad1117419 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Arguments passed to user function have to be properly allocated on heap
 2013-12-10 13:03:09 +04:00
Dmitry Stogov
a6516653b7 Arguments passed to user function have to be properly allocated on heap 2013-12-10 13:00:45 +04:00
Adam Harvey
d40a5a2797 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Switch to using freetype-config for freetype detection.
 2013-12-07 19:41:44 -08:00
Adam Harvey
d7a45a67be Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Switch to using freetype-config for freetype detection.
 2013-12-07 19:41:23 -08:00
Adam Harvey
a0955f351c Switch to using freetype-config for freetype detection. 
This fixes GD compilation against libfreetype 2.5.1 and later after they made
the rather interesting decision to change their include directory layout in a
point release.

The original suggestion in the bug was to use pkg-config, but my inclination is
to use freetype-config instead: we should be able to get the same configuration
information without actually needing pkg-config installed, since pkg-config is
by no means guaranteed to exist on many Unices and distros, whereas
freetype-config should always be present if a libfreetype build environment is
installed. Let's try it out and see what happens.

Fixes bug #64405 (Use freetype-config for determining freetype2 dir(s)).
 2013-12-07 19:39:40 -08:00
Michael Wallner
01a13bb8c1 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #61645 (fopen and O_NONBLOCK)
  fix possibly uninitialized value
  Use 'user@example.com' rather than 'user@company.com' in tests
 2013-12-06 10:34:11 +01:00
Michael Wallner
9ea2489f5c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #61645 (fopen and O_NONBLOCK)
  fix possibly uninitialized value
 2013-12-06 10:33:47 +01:00
Michael Wallner
a48d82d238 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #61645 (fopen and O_NONBLOCK)
  fix possibly uninitialized value
 2013-12-06 10:33:10 +01:00
Michael Wallner
098d2a5d0f fix possibly uninitialized value 2013-12-06 10:27:33 +01:00
Sara Golemon
9adfcea241 Use 'user@example.com' rather than 'user@company.com' in tests 
Using some arbitrary 3rd party's domain name is clowny,
even if it never tries to send.
 2013-12-04 07:51:43 -08:00
Michael Wallner
44ff944b37 Merge branch 'dba' 
* dba:
  fix bug #62490
  more test fixes
  fix test
  fix php_stream_copy_to_stream_ex usage
  add missing clean section
  remove test for already removed feature
 2013-12-05 11:27:26 +01:00
Michael Wallner
5a420c8680 fix bug #62490 
inifiles delete handler did not return false if the key was not found
 2013-12-05 11:04:25 +01:00
Andrey Hristov
0cb38a3d26 Merge branch 'master' of git.php.net:php-src 
Conflicts:
	NEWS
 2013-12-04 18:32:32 +02:00
Sara Golemon
f0248bdce5 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Use 'user@example.com' rather than 'user@company.com' in tests
 2013-12-04 07:50:45 -08:00
Sara Golemon
32a4cc8353 Use 'user@example.com' rather than 'user@company.com' in tests 
Using some arbitrary 3rd party's domain name is clowny,
even if it never tries to send.
 2013-12-04 07:49:16 -08:00
Andrey Hristov
406d5a5ecc Merge branch 'PHP-5.6' 
Conflicts:
	NEWS
	UPGRADING
 2013-12-04 16:20:03 +02:00
Andrey Hristov
97909ef4ef Merge branch 'PHP-5.5' into PHP-5.6 2013-12-04 12:39:11 +02:00
Andrey Hristov
ceb1b7e20f Merge branch 'PHP-5.4' into PHP-5.5 2013-12-04 12:07:18 +02:00
Andrey Hristov
86aad97979 Fix loss of precision 2013-12-04 12:06:59 +02:00
Adam Harvey
8f11f7f179 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
 2013-12-03 14:54:24 -08:00
Adam Harvey
44697c115b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
 2013-12-03 14:52:35 -08:00
Adam Harvey
6f52f566f3 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
 2013-12-03 14:51:03 -08:00
Adam Harvey
d1314893fd Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list. 
These were returned to the general allocation pool by RFC 3330, and hence
shouldn't cause an IP address validation failure due to being reserved. At
least 128.0.0.0/16 is in use on the public Internet today.

Fixes bug #66229 (128.0.0.0/16 isn't reserved any longer).
 2013-12-03 14:46:15 -08:00
Michael Wallner
f0c85fab45 more test fixes 2013-12-03 18:18:40 +01:00
Michael Wallner
b0415856fd fix test 2013-12-03 17:55:26 +01:00
Michael Wallner
9e309a2d10 fix php_stream_copy_to_stream_ex usage 2013-12-03 17:55:18 +01:00
Michael Wallner
a7f0465c0b add missing clean section 2013-12-03 17:07:40 +01:00
Michael Wallner
f4912e3a96 remove test for already removed feature 2013-12-03 16:57:35 +01:00
Nikita Popov
a87233f98a Merge branch 'PHP-5.6' 2013-12-02 20:11:34 +01:00
Nikita Popov
00c74ccf69 Support gmp_remroot() on GMP 4.1 2013-12-02 20:11:06 +01:00
Michael Wallner
c23a1f78b4 Merge branch 'PHP-5.6' 
* PHP-5.6:
  BFN
  Fix bug #65196
 2013-12-02 17:03:30 +01:00
Michael Wallner
f254476f99 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  BFN
  Fix bug #65196
 2013-12-02 17:02:13 +01:00
Michael Wallner
9c0a70c1de Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #65196
 2013-12-02 17:01:25 +01:00
Michael Wallner
22fa3fbc5f Fix bug #65196 
Passing DOMDocumentFragment to DOMDocument::saveHTML()
produces invalid markup, because a DocumentFragment is just a container
for child nodes and not a real node itself.
 2013-12-02 17:00:13 +01:00
Michael Wallner
7cd702640d Fix Bug #64776 The XSLT extension is not thread safe. 2013-12-02 15:01:24 +01:00
Michael Wallner
df484b0008 Merge branch 'PHP-5.6' 
* PHP-5.6:
  BFN
  fix bug #49634x
 2013-12-02 12:19:03 +01:00
Michael Wallner
733259c211 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  BFN
  fix bug #49634x
 2013-12-02 12:15:27 +01:00
Michael Wallner
e4b310d2a9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix bug #49634x
 2013-12-02 12:10:59 +01:00
Michael Wallner
6408a1a59e fix bug #49634x 2013-12-02 12:10:00 +01:00
Dmitry Stogov
f8148a3905 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed tests
 2013-12-02 12:05:49 +04:00
Dmitry Stogov
0f39089384 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed tests
 2013-12-02 12:05:29 +04:00
Dmitry Stogov
2f5ab04c5f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed tests
 2013-12-02 12:04:07 +04:00
Dmitry Stogov
edbefd1d5c Fixed tests 2013-12-02 11:53:35 +04:00
Felipe Pena
52611a2c7e Merge branch 'PHP-5.6' 
* PHP-5.6:
  - Fixed bug #65923 (ext/socket assumes AI_V4MAPPED is defined)
 2013-11-30 11:41:01 -02:00
Felipe Pena
a2f478cd94 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  - Fixed bug #65923 (ext/socket assumes AI_V4MAPPED is defined)
 2013-11-30 11:40:42 -02:00
Felipe Pena
78f69a2b4f - Fixed bug #65923 (ext/socket assumes AI_V4MAPPED is defined) 2013-11-30 11:39:57 -02:00
Nikita Popov
065c8e77e2 Merge branch 'PHP-5.6' 2013-11-29 23:32:14 +01:00
Nikita Popov
66b0d17f04 Merge branch 'PHP-5.5' into PHP-5.6 2013-11-29 23:31:13 +01:00
nikita2206
5f09944662 Fixed bug #65768: DateTimeImmutable::diff does not work 
This commit also prevents user classes from directly implementing
DateTimeInterface, because ext/date relies on classes implementing
it to support certain internal structures.
 2013-11-29 23:31:07 +01:00
Nikita Popov
0eb519de66 Merge branch 'PHP-5.6' 2013-11-29 00:10:13 +01:00
Nikita Popov
f54f308f71 Clean up GMP arginfos 
Removed duplicate arginfos, specified number of required args
everywhere and removed weird pass-by-ref arguments.
 2013-11-29 00:05:28 +01:00
Nikita Popov
6d38090c8d Add gmp_root() and gmp_rootrem() functions 2013-11-29 00:01:59 +01:00
Nikita Popov
1c8cbe4b4e Use class handlers for GMP serialization 
A bit faster and less boilerplate
 2013-11-29 00:01:59 +01:00
Nikita Popov
8860758a74 Remove duplicate / commented code in GMP 2013-11-29 00:01:59 +01:00
Dmitry Stogov
36bd7296c8 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 
* 'PHP-5.6' of git.php.net:php-src:
  Fixed bug #65199 (Wrong Day of Week) and fixed bug #63391 (Incorrect/inconsistent day of week prior to the year 1600)
  Marking those two as XFAIL for now.
  Fixed a few DST changeover issues.
  Move add/sub to timelib.
  Fix backwards transition diffs.
  Split up tests into their different categories.
  Group those tests a bit better, as some of the bd ones wanted a "ST" feature that doesn't exist yet.
  Fixed forward transitions in diffs.
  Always reset those parameters.
  Fixed "Forward Transition" construction of DateTime objects.
 2013-11-29 01:00:14 +04:00
Dmitry Stogov
f92eba241e Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  Fixed bug #65199 (Wrong Day of Week) and fixed bug #63391 (Incorrect/inconsistent day of week prior to the year 1600)
  Marking those two as XFAIL for now.
  Fixed a few DST changeover issues.
  Move add/sub to timelib.
  Fix backwards transition diffs.
  Split up tests into their different categories.
  Group those tests a bit better, as some of the bd ones wanted a "ST" feature that doesn't exist yet.
  Fixed forward transitions in diffs.
  Always reset those parameters.
  Fixed "Forward Transition" construction of DateTime objects.
 2013-11-29 00:59:47 +04:00
Dmitry Stogov
77cdda452d Merge branch 'PHP-5.6' 
* PHP-5.6:
  Avoid interned hash key duplication and hash key length recaclulation
 2013-11-29 00:59:26 +04:00
Dmitry Stogov
6c2a806820 Avoid interned hash key duplication and hash key length recaclulation 2013-11-29 00:57:49 +04:00
Derick Rethans
38574614c5 Merge branch 'PHP-5.6' 2013-11-28 16:33:23 +00:00
Derick Rethans
c3ac86c569 Merge branch 'PHP-5.5' into PHP-5.6 2013-11-28 16:33:17 +00:00
Derick Rethans
b0d24d3d20 Merge branch 'PHP-5.4' into PHP-5.5 2013-11-28 16:33:08 +00:00
Derick Rethans
d22cc5c816 Fixed bug #65199 (Wrong Day of Week) and fixed bug #63391 (Incorrect/inconsistent day of week prior to the year 1600) 2013-11-28 16:32:11 +00:00
Derick Rethans
b6ef87f803 Merge branch 'PHP-5.6' 2013-11-28 14:45:38 +00:00
Derick Rethans
3bf71b42b1 Merge branch 'PHP-5.5' into PHP-5.6 2013-11-28 14:45:26 +00:00
Derick Rethans
88067b6e60 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	ext/date/php_date.c
 2013-11-28 14:30:08 +00:00
Derick Rethans
aab0b2ce3b Marking those two as XFAIL for now. 2013-11-28 14:24:39 +00:00
Bob Weinand
be5b98ef0d Merge branch 'PHP-5.6' 2013-11-28 13:53:00 +01:00
Bob Weinand
d36cf90291 Merge branch 'const_scalar_exprs' into PHP-5.6 
Conflicts:
	Zend/zend_extensions.h
 2013-11-28 13:41:42 +01:00
Derick Rethans
582f6e529e Fixed a few DST changeover issues. 2013-11-28 12:02:36 +00:00
Derick Rethans
5d0c526199 Move add/sub to timelib. 2013-11-28 12:02:36 +00:00
Derick Rethans
324e6a5f82 Fix backwards transition diffs. 2013-11-28 12:02:36 +00:00
Derick Rethans
aa26ace21f Split up tests into their different categories. 2013-11-28 12:02:35 +00:00
Derick Rethans
7a0df7be34 Group those tests a bit better, as some of the bd ones wanted a "ST" feature that doesn't exist yet. 2013-11-28 12:02:35 +00:00
Derick Rethans
6e8b2c91c4 Fixed forward transitions in diffs. 2013-11-28 12:02:35 +00:00
Derick Rethans
261c6b31ca Always reset those parameters. 2013-11-28 12:02:35 +00:00
Derick Rethans
44a9e6b484 Fixed "Forward Transition" construction of DateTime objects. 
This fixes the issue in
https://wiki.php.net/rfc/datetime_and_daylight_saving_time#forward_transitions
There is a period during transition to DST where a time (such as 02:30) does
not exist. PHP already calculated the correct timestamp for this, but failed to
"rounded forward" to the existing correct hour value.
 2013-11-28 12:02:35 +00:00
Derick Rethans
e7a6d0b163 Merge branch 'PHP-5.6' 2013-11-27 22:01:16 +00:00
Derick Rethans
d3a12317cf Merge branch 'PHP-5.5' into PHP-5.6 2013-11-27 22:01:09 +00:00
Derick Rethans
4587ef569a Merge branch 'PHP-5.4' into PHP-5.5 2013-11-27 22:01:03 +00:00
Derick Rethans
23ab2575e1 Fixed bug #53879 (DateTime::createFromFormat() fails to parse cookie expiration date) 2013-11-27 21:59:46 +00:00
Remi Collet
42a35c9b8b Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  Fixed bug #66060 (Heap buffer over-read in DateInterval)
 2013-11-27 11:16:18 +01:00
Remi Collet
56909e7d9d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  Fixed bug #66060 (Heap buffer over-read in DateInterval)
 2013-11-27 11:15:58 +01:00
Remi Collet
28d215d0a8 Fixed bug #66060 (Heap buffer over-read in DateInterval) 2013-11-27 11:15:08 +01:00
Remi Collet
12fe4e90be Fixed bug #66060 (Heap buffer over-read in DateInterval) 2013-11-27 11:13:16 +01:00
Stanislav Malyshev
22ad8e1b1a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  5.4.24-dev now
  merge fix
  add test
  Fix for Bug #66141 (mysqlnd quote function is wrong with NO_BACKSLASH_ESCAPES after failed query)
 2013-11-27 00:18:54 -08:00
Andrey Hristov
0fc90b100d Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-11-26 20:10:30 +02:00
Andrey Hristov
dd7c33d0c9 Merge branch 'master' of git.php.net:php-src 2013-11-26 20:10:17 +02:00
Dmitry Stogov
0d61202427 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed opcahce_reset() crash when opcache.protect_memory is set
 2013-11-26 21:59:19 +04:00
Dmitry Stogov
834eaae52d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed opcahce_reset() crash when opcache.protect_memory is set
 2013-11-26 21:59:02 +04:00
Dmitry Stogov
de65817136 Fixed opcahce_reset() crash when opcache.protect_memory is set 2013-11-26 21:57:32 +04:00
Dmitry Stogov
bbdcbbdba5 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Added an optimization of class constants and constant calls to some internal functions
  Added an optimization of class constants and constant calls to some internal functions

Conflicts:
	NEWS
 2013-11-26 21:43:19 +04:00
Andrey Hristov
9c036b13f9 Merge branch 'PHP-5.5' 2013-11-26 19:37:43 +02:00
Dmitry Stogov
f000624864 Added an optimization of class constants and constant calls to some internal functions 2013-11-26 21:37:31 +04:00
Andrey Hristov
9a6b72a05a Merge branch 'PHP-5.4' into PHP-5.5 2013-11-26 19:15:43 +02:00
Andrey Hristov
5a3886f15c merge fix 2013-11-26 19:15:30 +02:00
Andrey Hristov
0aadab0e2e add test 2013-11-26 19:15:12 +02:00
Dmitry Stogov
1d65e8f135 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66176 (Invalid constant substitution)
  Fixed bug #66176 (Invalid constant substitution)
 2013-11-26 21:03:34 +04:00
Andrey Hristov
40dc242904 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	NEWS
	ext/mysqlnd/mysqlnd.c
 2013-11-26 19:02:45 +02:00
Andrey Hristov
74ba88e186 Fix for Bug #66141 (mysqlnd quote function is wrong with NO_BACKSLASH_ESCAPES after failed query) 2013-11-26 19:01:49 +02:00
Dmitry Stogov
e7132597a6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66176 (Invalid constant substitution)
  Fixed bug #66176 (Invalid constant substitution)
 2013-11-26 21:01:01 +04:00
Dmitry Stogov
d79dd9cc1c Fixed bug #66176 (Invalid constant substitution) 2013-11-26 21:00:00 +04:00
Dmitry Stogov
27524b52b5 Fixed bug #66176 (Invalid constant substitution) 2013-11-26 19:55:49 +04:00
Dmitry Stogov
34a55790f2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Revert NEWS
  Fixed bug #66176 (Invalid constant substitution)
 2013-11-26 17:49:38 +04:00
Dmitry Stogov
0999d85049 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66176 (Invalid constant substitution)

Conflicts:
	NEWS
 2013-11-26 17:48:11 +04:00
Dmitry Stogov
d85ac7fb3f Fixed bug #66176 (Invalid constant substitution) 2013-11-26 17:47:02 +04:00
Dmitry Stogov
854c9abcd4 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Added test
 2013-11-26 12:14:22 +04:00
Dmitry Stogov
8fdc973afa Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Added test
 2013-11-26 12:14:12 +04:00
Dmitry Stogov
f28ac55b6d Added test 2013-11-26 12:13:42 +04:00
Dmitry Stogov
b3ce714cbf Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #65559 (Opcache: cache not cleared if changes occur while running)
 2013-11-26 11:37:05 +04:00
Dmitry Stogov
621f83e35c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #65559 (Opcache: cache not cleared if changes occur while running)
  bring the news

Conflicts:
	NEWS
 2013-11-26 11:36:23 +04:00
Dmitry Stogov
a8c7e50f4d Fixed bug #65559 (Opcache: cache not cleared if changes occur while running) 2013-11-26 11:34:41 +04:00
Dmitry Stogov
704b24d048 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed compatibility with old PHP versions
  Fixed bug #65915 (Inconsistent results with require return value)
 2013-11-25 14:12:11 +04:00
Dmitry Stogov
b3c2c2bcb1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed compatibility with old PHP versions
  Fixed bug #65915 (Inconsistent results with require return value)

Conflicts:
	NEWS
 2013-11-25 14:11:45 +04:00
Dmitry Stogov
b7b6c35eea Fixed compatibility with old PHP versions 2013-11-25 14:09:57 +04:00
Dmitry Stogov
27dc82d0ec Fixed bug #65915 (Inconsistent results with require return value) 2013-11-25 14:07:24 +04:00
Anatol Belski
7f0d637de4 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fixed test
  export more Zend API
 2013-11-21 21:29:51 +01:00
Anatol Belski
696d286911 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fixed test
  And here is the real fix for #66124
  Fix for Bug #66124 (mysqli under mysqlnd loses precision when bind_param with 'i')
 2013-11-21 21:29:35 +01:00
Anatol Belski
ad5a63e8bc Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed test
 2013-11-21 21:29:02 +01:00
Anatol Belski
345032946c fixed test 2013-11-21 21:24:47 +01:00
Andrey Hristov
e09e45eb86 Merge branch 'PHP-5.5' 2013-11-21 21:30:36 +02:00
Andrey Hristov
763f4aef8b Merge branch 'PHP-5.4' into PHP-5.5 2013-11-21 21:29:37 +02:00
Andrey Hristov
ce09822269 And here is the real fix for #66124 2013-11-21 21:29:21 +02:00
Andrey Hristov
c2b2afacc0 Merge branch 'PHP-5.4' into PHP-5.5 2013-11-21 21:15:22 +02:00
Andrey Hristov
4a1c9be857 Fix for Bug #66124 (mysqli under mysqlnd loses precision when bind_param with 'i') 2013-11-21 21:14:42 +02:00
Yasuo Ohgaki
bccead024d Merge branch 'PHP-5.6' 
* PHP-5.6:
  added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean
 2013-11-20 07:25:45 +09:00
Yasuo Ohgaki
bf91f101a6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean
 2013-11-20 07:25:04 +09:00
Yasuo Ohgaki
b8b92bd790 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean
 2013-11-20 07:23:54 +09:00
Yasuo Ohgaki
0d558afc05 Fix WS in serialization_error_002.phpt 2013-11-20 07:17:53 +09:00
Aaron Hamid
050dd59c63 added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean 2013-11-20 07:14:53 +09:00
Jeff Welch
b2ca20312d Fixed tests that fail with non-default serialize_precision configurations. 
See:

 * https://bugs.php.net/bug.php?id=64760
 * 4dc4302
 2013-11-20 06:17:57 +09:00
Jeff Welch
72a8489a12 Fixed tests that fail with non-default serialize_precision configurations. 
See:

 * https://bugs.php.net/bug.php?id=64760
 * 4dc4302
 2013-11-20 06:17:34 +09:00
Jeff Welch
101c780500 Fixed tests that fail with non-default serialize_precision configurations. 
See:

 * https://bugs.php.net/bug.php?id=64760
 * 4dc4302
 2013-11-20 06:17:23 +09:00
Jeff Welch
b4210efe76 Fixed tests that fail with non-default serialize_precision configurations. 
See:

 * https://bugs.php.net/bug.php?id=64760
 * 4dc4302
 2013-11-20 06:14:32 +09:00
kovacs.ferenc
a833f7d460 Merge branch 'PHP-5.6' 2013-11-18 12:39:40 +01:00
kovacs.ferenc
2042d78fce Merge branch 'JSONCaseFix' of git://github.com/TazeTSchnitzel/php-src into TazeTSchnitzel-JSONCaseFix 2013-11-18 12:12:24 +01:00
Xinchen Hui
140a42f779 Merge branch 'PHP-5.5' into PHP-5.6 2013-11-17 17:20:13 +08:00
Xinchen Hui
5a282136a3 Merge branch 'PHP-5.5' 2013-11-17 17:11:20 +08:00
Xinchen Hui
de79c51555 Merge branch 'PHP-5.4' into PHP-5.5 2013-11-17 17:05:04 +08:00
Xinchen Hui
823e330c75 Fixed Bug #66094 (unregister_tick_function tries to cast a Closure to a string) 2013-11-17 17:04:37 +08:00
Remi Collet
a37ff1fa4b Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  Fix Bug #65714 	PHP cli forces the tty to cooked mode
 2013-11-15 09:53:23 +01:00
Remi Collet
4508a84d0d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  Fix Bug #65714 	PHP cli forces the tty to cooked mode
 2013-11-15 09:53:07 +01:00
Remi Collet
b8d88bf2c5 Fix Bug #65714 PHP cli forces the tty to cooked mode 
Only drop the using_history() call with libedit as I don't know
if it is required with readline.

This also allow to run a php script in background without
it being aborted on first output.
 2013-11-15 09:49:42 +01:00
Remi Collet
b6f76adef4 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix failed test with recent glibc
  5.5.7 now
 2013-11-13 13:21:28 +01:00
Remi Collet
74ab30e216 fix merge 2013-11-13 13:21:12 +01:00
Remi Collet
018b9445da Fix failed test with recent glibc 
In recent version of strptime glibc upstream has fixed a discrepancy between
documentation and actual behaviour by skipping over the sequence that would match %Z.
See ddc7e412ab

So when %Z is used in format
glibc <= 2.18 returns the GMT as unparsed
glibc >= 2.19 returns empty string

Removing %Z from tested format gives the same behavior with all version.
 2013-11-13 13:19:10 +01:00
Nikita Popov
b8525baecf Merge branch 'PHP-5.6' 2013-11-12 22:04:45 +01:00
Nikita Popov
dc4bf922d9 Allow $num=0 in array_fill() 
Implemented request #49824.
 2013-11-12 22:02:51 +01:00
Andrea Faulds
91779db95b Fixed case part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly") 2013-11-11 22:54:16 +00:00
Adam Harvey
91cb087727 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Update NEWS and remove the unnecessary UPGRADING note.
  UPGRADING and NEWS
  Better test: Check combined leading/trailing
  Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")
 2013-11-10 16:16:38 -05:00
Adam Harvey
1205a6c7dc Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update NEWS and remove the unnecessary UPGRADING note.
  UPGRADING and NEWS
  Better test: Check combined leading/trailing
  Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")
 2013-11-10 16:15:12 -05:00
Adam Harvey
304bff90f4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update NEWS and remove the unnecessary UPGRADING note.
  UPGRADING and NEWS
  Better test: Check combined leading/trailing
  Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")
 2013-11-10 16:11:28 -05:00
Adam Harvey
288e9c6423 Merge remote-tracking branch 'ajf/JSONWhitespaceFix' into PHP-5.4 2013-11-10 15:43:56 -05:00
Remi Collet
fac240b5d1 Merge branch 'PHP-5.6' 
* PHP-5.6:
  missing 'config.h' in 5dc37b3
 2013-11-10 07:10:48 +01:00
Remi Collet
6997b8793d missing 'config.h' in 5dc37b3 2013-11-10 07:10:36 +01:00
Rasmus Lerdorf
7e01935dc2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix broken test

Conflicts:
	NEWS
 2013-11-09 09:49:09 -08:00
Rasmus Lerdorf
6713f9c4b2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix broken test
 2013-11-09 09:46:55 -08:00
Rasmus Lerdorf
df7321359e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix broken test
 2013-11-09 09:46:43 -08:00
Rasmus Lerdorf
064ba179b1 Fix broken test 2013-11-09 09:45:52 -08:00
Adam Harvey
90d4ae4da8 Make all code paths in json_determine_array_type() return constants. 
This is a purely cosmetic change, but the current behaviour of returning
PHP_JSON_OUTPUT_ARRAY and 1 looks weird.
 2013-11-09 12:15:37 -05:00
Dmitry Stogov
43cb6ba763 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed issue #115 (path issue when using phar). Fixed issue #149 (Phar mount points not working with OPcache enabled).

Conflicts:
	NEWS
 2013-11-08 16:37:28 +04:00
Dmitry Stogov
0e5c5072e6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed issue #115 (path issue when using phar). Fixed issue #149 (Phar mount points not working with OPcache enabled).

Conflicts:
	NEWS
 2013-11-08 16:36:31 +04:00
Dmitry Stogov
915c428ba1 Fixed issue #115 (path issue when using phar). 
Fixed issue #149 (Phar mount points not working with OPcache enabled).
 2013-11-08 16:35:05 +04:00
Dmitry Stogov
8f097fb466 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Added tests for PHAR/OPCahce incompatibilities

Conflicts:
	NEWS
 2013-11-08 14:16:40 +04:00
Dmitry Stogov
4e6a0bd5a9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Added tests for PHAR/OPCahce incompatibilities
  Update NEWS
  Fixed bug #65947 (basename is no more working after fgetcsv in certain situation)
  Update NEWS
  Fixed Bug #66043 (Segfault calling bind_param() on mysqli)
  NEWS entry
  NEWS entry

Conflicts:
	NEWS
 2013-11-08 14:15:41 +04:00
Dmitry Stogov
49fbe2579e Added tests for PHAR/OPCahce incompatibilities 2013-11-08 13:50:57 +04:00
Xinchen Hui
6357cdaecf Merge branch 'PHP-5.5' 2013-11-08 15:33:57 +08:00
Xinchen Hui
5f17c4d08e Merge branch 'PHP-5.4' into PHP-5.5 2013-11-08 15:33:27 +08:00
Xinchen Hui
cf2626f10c Fixed bug #65947 (basename is no more working after fgetcsv in certain situation) 
previous codes: "#define php_mblen(ptr, len) ((ptr) == NULL ? mbsinit(&BG(mblen_state)):
(int)mbrlen(ptr, len, &BG(mblen_state)))#

it use mbsinit there, seems try to initialize the mblen_state, but:
"This function does not change the state identified by ps. Typical ways
to make the state pointed by ps an initial state are:

memset (ps,0,sizeof(*ps));  // ps points to zero-valued object
"
http://www.cplusplus.com/reference/cwchar/mbsinit/?kw=mbsinit
 2013-11-08 15:32:28 +08:00
Xinchen Hui
4c13992f0d Merge branch 'PHP-5.5' 2013-11-08 15:09:08 +08:00