clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 15:26:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,749 Commits 494 Branches 1,367 Tags 807 MiB
77f5caae53
Commit Graph

8023 Commits

Author SHA1 Message Date
Anatol Belski
827100df82 split the glob() test to test different basedir 2013-08-20 13:40:19 +02:00
Michael Wallner
73cd2e0ab1 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix bug #65481 (shutdown segfault due to serialize)
 2013-08-20 00:09:26 +02:00
Michael Wallner
9d2cdacf4a Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix bug #65481 (shutdown segfault due to serialize)

Conflicts:
	ext/standard/var_unserializer.c
 2013-08-20 00:08:55 +02:00
Michael Wallner
1ac4d8f2c6 fix bug #65481 (shutdown segfault due to serialize) 2013-08-20 00:05:11 +02:00
Anatol Belski
f4df40108b fixed glob() edge case on windows, ref bug #47358 2013-08-19 14:21:16 +02:00
Anatol Belski
f61b648da4 modified the new glob() test for master 2013-08-19 11:22:18 +02:00
Anatol Belski
6c570ad322 Merge branch 'PHP-5.5' 
* PHP-5.5:
  added new glob() test
 2013-08-19 11:21:47 +02:00
Anatol Belski
cdc64f0345 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  added new glob() test
 2013-08-19 11:19:42 +02:00
Anatol Belski
4bad49e3bc added new glob() test 2013-08-19 11:17:13 +02:00
Stanislav Malyshev
03b2603ce0 Merge branch 'PHP-5.5' 
* PHP-5.5:
  code related typo fixes
  Fix duplicated 5.5.2 NEWS in my tree
 2013-08-18 13:47:00 -07:00
Veres Lajos
144eab0889 code related typo fixes 2013-08-18 13:46:32 -07:00
Christopher Jones
4824d0f43e Merge branch 'PHP-5.5' 
* PHP-5.5:
  Reduce compiler noise by removing unused variables and labels
 2013-08-14 21:08:55 -07:00
Christopher Jones
cd14de94d2 Reduce compiler noise by removing unused variables and labels 2013-08-14 21:06:59 -07:00
Christopher Jones
3c166c4758 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.

Conflicts:
	ext/gmp/gmp.c
 2013-08-14 20:47:00 -07:00
Christopher Jones
39612afc72 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.

Conflicts:
	ext/dba/libinifile/inifile.c
 2013-08-14 20:43:25 -07:00
Christopher Jones
9ad97cd489 Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings. 2013-08-14 20:36:50 -07:00
Christopher Jones
759517651e Merge branch 'PHP-5.5' 
* PHP-5.5:
  Skip test if SKIP_ONLINE_TESTS set
 2013-08-14 15:47:42 -07:00
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