clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,992 Commits 491 Branches 1,363 Tags 844 MiB
07e52857b5
Commit Graph

73992 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pierre Joye
07e52857b5 fix #65070, bgcolor does not use the same format as the input image with imagerotate 2013-06-20 22:19:33 +02:00
Pierre Joye
0a6ec7a2c9 add notes about opcache windows issue and migration from APC 2013-06-19 17:57:08 +02:00
Anatol Belski
2873b5b6eb added some tests based on bug #64395 2013-06-19 16:24:30 +02:00
Johannes Schlüter
c6b8d992ba Merge branch 'PHP-5.4' into PHP-5.5 2013-06-19 15:09:33 +02:00
Johannes Schlüter
0e55d3a12a Merge branch 'PHP-5.3' into PHP-5.4 2013-06-19 15:09:04 +02:00
Johannes Schlüter
f0eaa02f6f This will be PHP 5.3.28 2013-06-19 15:08:02 +02:00
Remi Collet
fb68e0fe63 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Related to bug #65047 (Test skip on client / server version)
 2013-06-19 12:26:53 +02:00
Remi Collet
67bde2f8ac Related to bug #65047 (Test skip on client / server version) 
bug46274.phpt and bug46274_2.phpt
Make query silent (when server don't know bytea_output option)

bug_49985.phpt
Make result "locale" independent
 2013-06-19 12:26:21 +02:00
Matteo Beccati
9b8259cdfa Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #65047 (Test skip on client / server version)
  Remove broken client version checking
  Clean up leftover file after the test
 2013-06-19 11:53:05 +02:00
Matteo Beccati
c666239265 Fixed bug #65047 (Test skip on client / server version) 2013-06-19 11:48:03 +02:00
Matteo Beccati
25e9aa6b0a Remove broken client version checking 2013-06-19 11:48:03 +02:00
Matteo Beccati
5edd530511 Clean up leftover file after the test 2013-06-19 11:48:03 +02:00
Stanislav Malyshev
7b08c7f4e7 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  sync NEWS
 2013-06-18 23:09:29 -07:00
Stanislav Malyshev
e2bb74ab4f sync NEWS 2013-06-18 23:06:20 -07:00
Stanislav Malyshev
59d4d41efb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  5.4.18 next

Conflicts:
	configure.in
	main/php_version.h
 2013-06-18 22:59:26 -07:00
Stanislav Malyshev
dda3f404ec 5.4.18 next 2013-06-18 22:58:11 -07:00
Xinchen Hui
bb9928c343 Merge branch 'PHP-5.4' into PHP-5.5 2013-06-19 11:17:44 +08:00
Xinchen Hui
2ce4bd7f2d Fix test typo 2013-06-19 11:15:52 +08:00
Nikita Popov
86434be946 Fix bug #65051: count() off by one inside unset() 
nNumOfElements was incremented after the pDestructor code, so any
code in the dtor would get a wrong number of elements.

Right now the bucket deletion code is replicated in four places,
it should probably be moved off into one function (or rather,
zend_hash_apply_deleter should be used everywhere). The codes are
subtly different though in that the HANDLE_UNBLOCK_INTERRUPTIONS()
happens in different places. In particular it seems odd that in
some cases interruptions stay blocked during the destructor call.
 2013-06-17 23:44:13 +02:00
Stanislav Malyshev
d587efb7ee Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Merge branch 'pull-request/320'
 2013-06-17 01:06:28 -07:00
Stanislav Malyshev
af5e2eaf8d Merge branch 'pull-request/320' 
* pull-request/320:
  this is test 5 not 6
  fix race condition
  more shared names that create race conditions
  change to a unique filename
  more shared filenames
  yet another shared filename
  don't share a filename to stop race conditions
  fix race condition for 2-4 and normalize names for others
  fix race condition when running tests in parallel
  clean up after test
  Fix #64572: Clean up after the test
  Fix #64572: Clean up after the test
 2013-06-17 01:06:20 -07:00
Stanislav Malyshev
6b896fa57f Merge branch 'pull-request/320' 
* pull-request/320:
  this is test 5 not 6
  fix race condition
  more shared names that create race conditions
  change to a unique filename
  more shared filenames
  yet another shared filename
  don't share a filename to stop race conditions
  fix race condition for 2-4 and normalize names for others
  fix race condition when running tests in parallel
  clean up after test
  Fix #64572: Clean up after the test
  Fix #64572: Clean up after the test
 2013-06-17 01:06:01 -07:00
Stanislav Malyshev
a080611e48 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Tests: PDO Mysql - update for fixed getColumnMeta()
  fix bug #48724
 2013-06-17 00:42:21 -07:00
Daniel Beardsley
5ac0ee30ce Tests: PDO Mysql - update for fixed getColumnMeta() 
The test has always been disabled... so it's never run anyway. Oh well.
 2013-06-17 00:41:21 -07:00
Antony Dovgal
95cc763a14 fix bug #48724 
PDO's getColumnMeta() doesn't return native_type for BIT, TINYINT and YEAR
 2013-06-17 00:27:21 -07:00
Stanislav Malyshev
69d187de02 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  readline can output control codes
  Bug #55694: Update readline test to support attempted_completion_over variable
  Bug #55694: Expose attempted_completion_over variable from readline library
 2013-06-17 00:17:06 -07:00
Stanislav Malyshev
248414f132 readline can output control codes 2013-06-17 00:15:31 -07:00
Hartmel
272c5edea4 Bug #55694: Update readline test to support attempted_completion_over variable 2013-06-16 23:44:44 -07:00
Hartmel
ca3e0862db Bug #55694: Expose attempted_completion_over variable from readline library 2013-06-16 23:42:43 -07:00
Xinchen Hui
aa2369f85a Merge branch 'PHP-5.4' into PHP-5.5 2013-06-17 13:23:24 +08:00
Xinchen Hui
cfb1ffb4fa Fix typo in test 2013-06-17 13:22:20 +08:00
Stanislav Malyshev
9bfb28c793 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Identation Fixed
 2013-06-16 18:14:16 -07:00
Jefersson Nathan
ebef8c4176 Identation Fixed 2013-06-16 18:13:49 -07:00
Stanislav Malyshev
59280d910a Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Identation Fixed
 2013-06-16 18:13:26 -07:00
Jefersson Nathan
1498b8260b Identation Fixed 2013-06-16 18:13:14 -07:00
Stanislav Malyshev
a770ae36c2 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #64764: Add status option to fpm init.d script
 2013-06-16 16:56:29 -07:00
Lior Kaplan
ee01af7df1 Fix bug #64764: Add status option to fpm init.d script 2013-06-16 16:54:49 -07:00
Stanislav Malyshev
44822a7166 update NEWS 2013-06-16 16:41:23 -07:00
Stanislav Malyshev
d44daff4d0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  news for #64166
 2013-06-16 16:40:52 -07:00
Stanislav Malyshev
2a93fd1347 news for #64166 2013-06-16 16:40:39 -07:00
Stanislav Malyshev
7d1fef15cf Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  add more tests for bug #64166
  Move unsigned char declaration to top of block
  trailing ws
  Fix #64166: quoted-printable-encode stream filter incorrectly discarding whitespace
  Fix #64166: quoted-printable-encode stream filter incorrectly discarding whitespace
 2013-06-16 16:38:49 -07:00
Stanislav Malyshev
7bb052ee3e add more tests for bug #64166 2013-06-16 16:34:34 -07:00
Michael M Slusarz
0dc98208ee Move unsigned char declaration to top of block 2013-06-16 16:04:29 -07:00
Michael M Slusarz
d9c034ee5e trailing ws 2013-06-16 16:04:24 -07:00
Michael M Slusarz
b5b0a53b09 Fix #64166: quoted-printable-encode stream filter incorrectly discarding whitespace 
Second attempt: need to use lookaheadto determine whether to encode ws
 2013-06-16 16:04:19 -07:00
Michael M Slusarz
600d6deef9 Fix #64166: quoted-printable-encode stream filter incorrectly discarding whitespace 
If trailing whitespace on a line is detected, mark the linebreak as a
soft linebreak.
 2013-06-16 16:04:14 -07:00
Stanislav Malyshev
ac343d5c1f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #64936 - clean doc comment state at the beginning and end of the scan
  ws fix

Conflicts:
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner.l
	Zend/zend_language_scanner_defs.h
 2013-06-16 15:29:25 -07:00
Stanislav Malyshev
2208447d42 Fix bug #64936 - clean doc comment state at the beginning and end of the scan 2013-06-16 15:22:23 -07:00
Stanislav Malyshev
088c183639 ws fix 2013-06-16 15:22:23 -07:00
Anatol Belski
3625b83aaa Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix test
 2013-06-17 00:10:32 +02:00