clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 14:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
76,159 Commits 494 Branches 1,367 Tags 801 MiB
5d6087497c
Commit Graph

8056 Commits

Author SHA1 Message Date
Christopher Jones
8c61758dc7 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Skip test if SKIP_ONLINE_TESTS set
 2013-08-14 15:45:46 -07:00
Christopher Jones
9d62807190 Skip test if SKIP_ONLINE_TESTS set 2013-08-14 15:45:06 -07:00
Michael Wallner
14caf174ff unify stdint type usage 
if you need C99 stdint types, just include "php_stdint.h"
 2013-08-06 22:49:56 +02:00
Stanislav Malyshev
68e8326e0e Merge branch 'PHP-5.5' 
* PHP-5.5:
  non living code related typo fixes
 2013-08-04 16:07:13 -07:00
Stanislav Malyshev
c793a65690 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  non living code related typo fixes

Conflicts:
	Zend/zend_compile.c
 2013-08-04 16:06:24 -07:00
Veres Lajos
8d86597d73 non living code related typo fixes 2013-08-04 16:05:36 -07:00
Xinchen Hui
55d335fa95 Merge branch 'PHP-5.5' 2013-08-02 18:43:17 +08:00
Xinchen Hui
47ac4f8670 Fixed tests (inet_pton behaves differently on Darwin) 2013-08-02 18:43:08 +08:00
Andrey Hristov
92d27ccb05 Constify streams API and a few other calls down the rabbit hole. 
(`char *` to `const char *` for parameters and few return values)
In a few places int len moved to size_t len.
 2013-07-30 12:49:36 +02:00
Stanislav Malyshev
46cc826770 Merge branch 'pull-request/231' 
* pull-request/231:
  update Zend Engine logo as per Zeev, and tweak PHP logos ... :)
  fix for scrolling, other minor tweaks
  Bump up table width a bit more and make columns consistent
  Bringing CSS up to this decade's standards.
 2013-07-21 22:49:26 -07:00
Stanislav Malyshev
02457554a3 Merge branch 'PHP-5.5' 
* PHP-5.5:
  backward compatibility
  HASH_KEY_NON_EXISTANT fix
 2013-07-21 20:10:31 -07:00
Veres Lajos
4749457a49 HASH_KEY_NON_EXISTANT fix 2013-07-21 20:09:53 -07:00
Xinchen Hui
a522f2d1c9 Merge branch 'PHP-5.5' 2013-07-21 21:07:50 +08:00
Xinchen Hui
c7b58e4967 Merge branch 'PHP-5.4' into PHP-5.5 2013-07-21 21:07:27 +08:00
Xinchen Hui
3380de9774 Fixed bug #65304 (Use of max int in array_sum) 2013-07-21 21:07:19 +08:00
Arpad Ray
b594949144 Merge branch 'PHP-5.5' 
* PHP-5.5:
  regenerate url scanner
  Fixed bug #50308 - session id not appended properly for empty anchor tags
 2013-07-17 16:28:12 +01:00
Arpad Ray
31edf4df56 regenerate url scanner 2013-07-17 16:28:01 +01:00
Arpad Ray
94ab37f06a Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #50308 - session id not appended properly for empty anchor tags
 2013-07-17 16:19:53 +01:00
Arpad Ray
e6ae977082 Fixed bug #50308 - session id not appended properly for empty anchor tags 
The issue was actually because a lack of space before a "/" marking the tag
as empty. This was being swallowed in the rule for unquoted values. Fixed
by making that rule exclude quotes (as per spec anyway).
 2013-07-17 16:07:26 +01:00
Anatol Belski
12aec9ec8e Merge branch 'PHP-5.5' 
* PHP-5.5:
  added sapi check for dl() test
 2013-07-16 15:43:59 +02:00
Anatol Belski
f37ac6f591 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  added sapi check for dl() test
 2013-07-16 15:43:37 +02:00
Anatol Belski
135f81c5ae added sapi check for dl() test 2013-07-16 15:42:38 +02:00
Veres Lajos
2c73ce4363 revert false fix 2013-07-15 00:23:17 -07:00
Veres Lajos
e9a95d78ef typo fixes 2013-07-15 00:23:03 -07:00
Veres Lajos
b79b13b4ef less serious compatAbility fixes 2013-07-15 00:21:39 -07:00
Veres Lajos
c2088f8b81 revert false fix 2013-07-15 00:19:56 -07:00
Veres Lajos
1b06e0be96 typo fixes 2013-07-15 00:19:49 -07:00
Veres Lajos
d17e8ac32f less serious compatAbility fixes 2013-07-15 00:19:39 -07:00
Veres Lajos
f23a5fbc8e revert false fix 2013-07-15 00:19:07 -07:00
Veres Lajos
72085b0e5f typo fixes 2013-07-15 00:18:57 -07:00
Veres Lajos
227556c6a2 less serious compatAbility fixes 2013-07-15 00:17:35 -07:00
Anatol Belski
14b67ed6da Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix uninitialized memory usage
 2013-07-14 20:46:48 +02:00
Anatol Belski
168a5bb6df Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix uninitialized memory usage
 2013-07-14 20:46:19 +02:00
Anatol Belski
add0833681 fix uninitialized memory usage 2013-07-14 20:44:29 +02:00
Anatol Belski
ecf057d197 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #65226 chroot() does not get enabled
 2013-07-11 00:49:41 +02:00
Anatol Belski
2acc386270 Fixed bug #65226 chroot() does not get enabled 2013-07-11 00:48:12 +02:00
Sara Golemon
95017c0522 Add a couple more test cases to parse_url() tests 
http://::# (valid but silly)
http://#   (invalid)
 2013-07-10 08:26:47 -07:00
Anatol Belski
ecb55dd9f5 Merge branch 'PHP-5.5' 
* PHP-5.5:
  updated NEWS
  Fixed bug #65226 chroot() does not get enabled
 2013-07-11 00:52:08 +02:00
Yasuo Ohgaki
870d238b06 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Added warning for hex2bin() when input is invalid string
  Update NEWS
 2013-07-08 19:15:04 +09:00
Yasuo Ohgaki
bde0f1318a Added warning for hex2bin() when input is invalid string 2013-07-08 19:14:45 +09:00
Xinchen Hui
11b757d53e Merge branch 'PHP-5.5' 2013-07-08 11:21:54 +08:00
Ben Ramsey
d1c261d7f8 array_column: Changing integer in test output to use %d 2013-07-06 20:50:34 +00:00
Felipe Pena
c743d0c9dc Merge branch 'PHP-5.5' 
* PHP-5.5:
  - Fixed test
 2013-06-26 13:36:50 -03:00
Felipe Pena
32f11e4ee6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed test
 2013-06-26 13:36:41 -03:00
Felipe Pena
f477ad22c2 - Fixed test 2013-06-26 13:36:36 -03:00
Andrey Hristov
793694b9d8 Merge branch 'PHP-5.5' 2013-06-26 16:51:42 +02:00
Andrey Hristov
781be5f1d7 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	NEWS
 2013-06-26 16:50:08 +02:00
Andrey Hristov
b34e8d2e3e add new test 2013-06-26 16:44:26 +02:00
Felipe Pena
f0823ac493 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
  - BFN
 2013-06-25 18:00:47 -03:00
Felipe Pena
adb116dd48 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
  - BFN
 2013-06-25 18:00:42 -03:00
Felipe Pena
41b73e4cee - Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com 2013-06-25 18:00:33 -03:00
David Soria Parra
c1b8fbc112 Update credits 2013-06-19 22:03:18 +02:00
Anatol Belski
d9f538bc68 Merge branch 'PHP-5.5' 
* PHP-5.5:
  added some tests based on bug #64395
 2013-06-19 16:25:08 +02:00
Anatol Belski
2873b5b6eb added some tests based on bug #64395 2013-06-19 16:24:30 +02:00
Stanislav Malyshev
1143f58a70 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Merge branch 'pull-request/320'
  Merge branch 'pull-request/320'
 2013-06-17 01:07: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
e3cd0d1417 Merge branch 'PHP-5.5' 
* PHP-5.5:
  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:39:06 -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
Anatol Belski
fd706595d4 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix test
 2013-06-17 00:11:05 +02: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
Anatol Belski
b6dd1ec60d fix test 
breach introduced in ac40c0b562
 2013-06-17 00:09:05 +02:00
Anatol Belski
c1772cc3df Merge branch 'PHP-5.5' 
* PHP-5.5:
  ensure the error_reporting level to get expected notice
 2013-06-12 13:15:32 +02:00
Anatol Belski
a0cb61b292 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  ensure the error_reporting level to get expected notice
 2013-06-12 13:15:18 +02:00
Anatol Belski
ed2690477c Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  ensure the error_reporting level to get expected notice
 2013-06-12 13:14:53 +02:00
Anatol Belski
cd1b44c4b6 ensure the error_reporting level to get expected notice 2013-06-12 13:13:48 +02:00
Stanislav Malyshev
8ac131503d Merge branch 'PHP-5.5' 
* PHP-5.5:
  Merge branch 'pull-request/341'
  Merge branch 'pull-request/341'
 2013-06-10 14:31:57 -07:00
Stanislav Malyshev
02e4d7a290 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:20:18 -07:00
Stanislav Malyshev
09bc6d7cf6 Merge branch 'PHP-5.5' 
* PHP-5.5:
  typo fixes (argument)
  typo fixes (accommodate, parameter)
 2013-06-10 13:37:56 -07:00
Stanislav Malyshev
84e35fb2e0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  typo fixes (argument)
  typo fixes (accommodate, parameter)
 2013-06-10 13:36:41 -07:00
Veres Lajos
04145dc2aa typo fixes (argument) 2013-06-10 13:36:17 -07:00
Veres Lajos
ed2e84e239 typo fixes (accommodate, parameter) 2013-06-10 13:36:03 -07:00
Anatol Belski
c6b569011a Merge branch 'PHP-5.5' 
* PHP-5.5:
  updated NEWS
  updated NEWS
  Fixed bug #64934 Apache2 TS crash with get_browser()
 2013-06-06 18:53:41 +02:00
Anatol Belski
bbdbef40db Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated NEWS
  Fixed bug #64934 Apache2 TS crash with get_browser()
 2013-06-06 18:52:39 +02:00
Anatol Belski
25cae37b13 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #64934 Apache2 TS crash with get_browser()
 2013-06-06 18:51:32 +02:00
Anatol Belski
1aee7ad636 Fixed bug #64934 Apache2 TS crash with get_browser() 
In favour of reading the browscap.ini into a true global var
only once in MINIT, the price for that is to deep copy the
any data from it.
 2013-06-06 18:49:04 +02:00
Stanislav Malyshev
3c8c200d0a Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix CVE-2013-2110 - use correct formula to calculate string size
 2013-06-04 22:01:02 -07:00
Stanislav Malyshev
785f4c5fc6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix CVE-2013-2110 - use correct formula to calculate string size
 2013-06-04 22:00:45 -07:00
Stanislav Malyshev
efdeec3c0e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fix CVE-2013-2110 - use correct formula to calculate string size
 2013-06-04 21:58:44 -07:00
Stanislav Malyshev
93e0d78ec6 fix CVE-2013-2110 - use correct formula to calculate string size 2013-06-04 21:56:33 -07:00
Sara Golemon
cfd1045822 Add optional second arg to unserialize() 
Returns the number of bytes consumed by reference for
streaming unserialization.

Actual unserialization behavior is not modified at all.

The need for this came up while trying to parse SplDoublyLinkedList's
serialization format which uses a non-standard stream of serialized values.
 2013-05-16 15:18:35 -07:00
David Soria Parra
c5841f8cb7 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix array_colum segfault
 2013-05-15 14:43:03 +02:00
David Soria Parra
139e9824ad Fix array_colum segfault 
Separate zval to avoid gc from freeing
 2013-05-15 14:42:39 +02:00
Anatol Belski
a14a809aff Merge branch 'PHP-5.5' 
* PHP-5.5:
  better fix for bug #64770
  better fix for bug #64770
 2013-05-04 12:20:36 +02:00
Anatol Belski
b2ef8672c7 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  better fix for bug #64770
  better fix for bug #64770
 2013-05-04 12:20:19 +02:00
Anatol Belski
ec4388158d better fix for bug #64770 2013-05-04 12:19:52 +02:00
Anatol Belski
5c701d19ac better fix for bug #64770 2013-05-04 12:16:38 +02:00
Anatol Belski
88c83469b5 Merge branch 'PHP-5.5' 
* PHP-5.5:
  updated NEWS
  updated NEWS
  Fixed bug #64770 stream_select() fails with pipes
 2013-05-03 17:06:16 +02:00
Anatol Belski
6d41711fd9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated NEWS
  Fixed bug #64770 stream_select() fails with pipes
 2013-05-03 17:04:53 +02:00
Anatol Belski
aa4762572e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #64770 stream_select() fails with pipes
 2013-05-03 17:03:16 +02:00
Anatol Belski
b1ea0b7a7a Fixed bug #64770 stream_select() fails with pipes 
returned by proc_open() on Windows x64
 2013-05-03 17:01:33 +02:00
Matt Ficken
67a72ceb93 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix Test Bug #64714
 2013-04-25 11:37:36 -07:00
Matt Ficken
7d0dd957eb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix Test Bug #64714
 2013-04-25 11:37:25 -07:00
Matt Ficken
5adf1be45d Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix Test Bug #64714
 2013-04-25 11:37:09 -07:00