mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-23 08:49:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
85,948 Commits 503 Branches 1,387 Tags 843 MiB
c78c6adbd5
Commit Graph

85948 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinchen Hui
9e1da42af1 Use macro 2014-10-30 11:52:29 +08:00
Xinchen Hui
64a44eab77 Merge branch 'PHP-5.6' 2014-10-30 11:42:40 +08:00
Xinchen Hui
7b4993dd16 Fixed build.... (shouldn't it be zend_output_globals?) 2014-10-30 11:42:02 +08:00
Anatol Belski
d77ce31763 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix output globals importing
  export output globals
  use portable strndup implementation
  unix sockets aren't available on windows
  dll export APIs needed by phpdbg
  fix sapi/phpdbg/config.w32
  Don't treat warnings as failures in the junit output
 2014-10-29 20:04:56 +01:00
Anatol Belski
fc904569ea fix output globals importing 2014-10-29 20:03:28 +01:00
Anatol Belski
5d76185792 export output globals 
needed by phpdbg
 2014-10-29 20:02:41 +01:00
Anatol Belski
4b8f411d31 use portable strndup implementation 2014-10-29 19:49:20 +01:00
Anatol Belski
f842b8f4be unix sockets aren't available on windows 2014-10-29 19:39:46 +01:00
Anatol Belski
fdbfcc0b51 dll export APIs needed by phpdbg 2014-10-29 19:32:52 +01:00
Anatol Belski
79a4339f1b fix sapi/phpdbg/config.w32 2014-10-29 19:28:21 +01:00
Anatol Belski
23f089a6b3 fix datatype mismatches 2014-10-29 15:30:16 +01:00
Anatol Belski
897695764c fix datatype mismatches 
sizeof(struct _string) doesn't increase.
 2014-10-29 15:30:14 +01:00
Anatol Belski
1100f1b8fd fix datatype mismatch 2014-10-29 15:30:13 +01:00
Anatol Belski
110cf649b7 fix datatype mismatches 
especially spl_dual_it_object current.pos should have the same datatype as
limit.offset, also this doesn't increase the struct size.
 2014-10-29 15:30:12 +01:00
Anatol Belski
9d21ff6b9e fix datatype mismatches 
PCRE uses plain datatypes, no typedefs.
 2014-10-29 15:30:11 +01:00
Anatol Belski
da1d0ee1bd fix the comparison return value 2014-10-29 15:30:10 +01:00
Anatol Belski
3a6db1e77a fix datatype mismatch 2014-10-29 15:30:09 +01:00
Anatol Belski
e888f3e4de fix datatype mismatches 2014-10-29 15:30:08 +01:00
Anatol Belski
8041bbb76b fix datatype mismatch warning 2014-10-29 15:30:07 +01:00
Anatol Belski
c6116bea57 fix datatype mismatches 2014-10-29 15:30:06 +01:00
Anatol Belski
10d843b0fb fix datatype mismatch warnings 2014-10-29 15:30:04 +01:00
Anatol Belski
20f8f533e1 fix datatype mismatch warns 2014-10-29 15:30:03 +01:00
Anatol Belski
842a98ef32 fix datatype mismatch warn 2014-10-29 15:30:02 +01:00
Anatol Belski
9fd0364576 fix datatype mismatch warnings 2014-10-29 15:30:01 +01:00
Anatol Belski
cf581178e7 fix "inconsistent dll linkage" warning caused by bison 
stdlib.h might not be always using _STDLIB_H, that will move bison
to redeclare the malloc/free prototypes.
 2014-10-29 15:30:00 +01:00
Anatol Belski
d9d16d2e68 fix datatype mismatch warnings 2014-10-29 15:29:59 +01:00
Matteo Beccati
8bd58502ca Don't treat warnings as failures in the junit output 
This matches Travis and the actual return code.
 2014-10-29 14:34:58 +01:00
Matteo Beccati
abfb30dc67 Don't treat warnings as failures in the junit output 
This matches Travis and the actual return code.
 2014-10-29 14:34:48 +01:00
Matteo Beccati
a3b4f8320d Don't treat warnings as failures in the junit output 
This matches Travis and the actual return code.
 2014-10-29 14:33:36 +01:00
Bob Weinand
3e9138e6b5 Merge remote-tracking branch 'origin/PHP-5.6' 2014-10-29 11:44:46 +01:00
Bob Weinand
68b5dd2ba9 Merge phpdbg into PHP-5.6 2014-10-29 11:43:01 +01:00
Bob Weinand
6545a5c234 Merge php-src into phpdbg 2014-10-29 11:40:56 +01:00
Matteo Beccati
551cb82a59 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed test to work with recent libcurl versions
  PHP 5.5.20 now
 2014-10-29 11:32:57 +01:00
Matteo Beccati
eb4e4b7bca Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed test to work with recent libcurl versions
  PHP 5.5.20 now

Conflicts:
	configure.in
	main/php_version.h
 2014-10-29 11:32:12 +01:00
Matteo Beccati
daf9357d27 Fixed test to work with recent libcurl versions 2014-10-29 11:28:27 +01:00
Bob Weinand
919bd3eb0c Enable shared builds for webhelper 2014-10-29 11:28:09 +01:00
Remi Collet
770473a648 Merge branch 'PHP-5.6' 
* PHP-5.6:
  cleanup uneeded json
 2014-10-29 07:26:58 +01:00
Remi Collet
89e613cf01 cleanup uneeded json 2014-10-29 07:26:41 +01:00
Remi Collet
7dd871438f cleanup uneeded json 2014-10-29 07:26:41 +01:00
Bob Weinand
4fec48d1b0 Merge remote-tracking branch 'origin/PHP-5.6' 2014-10-28 23:07:46 +01:00
Bob Weinand
47fd168fed Move missing zend_hash_* macros from phpdbg.h to zend_hash.h 2014-10-28 23:07:36 +01:00
Bob Weinand
beb767dbe0 Merge phpdbg into PHP-5.6 2014-10-28 23:06:50 +01:00
Bob Weinand
a5415456d4 Merge phpdbg into PHP-5.6 2014-10-28 23:06:50 +01:00
Bob Weinand
31ada13463 Removed last HAVE_JSON check 2014-10-28 23:06:32 +01:00
Bob Weinand
66aead4b5f Merge remote-tracking branch 'origin/PHP-5.6' 
Conflicts:
	sapi/phpdbg/phpdbg_wait.c
	sapi/phpdbg/phpdbg_webdata_transfer.c
 2014-10-28 23:00:10 +01:00
Bob Weinand
45e2dc692b Merge phpdbg into PHP-5.6 2014-10-28 22:44:29 +01:00
Bob Weinand
be5d389768 Merge phpdbg into PHP-5.6 2014-10-28 22:44:29 +01:00
Bob Weinand
234df7d2ca Fix versions & config.m4 2014-10-28 22:33:41 +01:00
Bob Weinand
4bc7a91be7 Merge ../phpdbg into PHP-5.6 
Conflicts:
	sapi/phpdbg/config.m4
 2014-10-28 22:15:05 +01:00
Bob Weinand
6150d9342c Merge ../phpdbg into PHP-5.6 
Conflicts:
	sapi/phpdbg/config.m4
 2014-10-28 22:15:05 +01:00