clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 19:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
76,049 Commits 491 Branches 1,363 Tags 846 MiB
75ba75e205
Commit Graph

76049 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tjerk Meesters
75ba75e205 Using only two constants to signal use type intent. 2013-09-28 00:06:04 +08:00
datibbaw
0492145e58 added bitmask variation 2013-09-28 00:06:04 +08:00
Tjerk Anne Meesters
b8653d3457 fixed test case to pass on other systems than my own 2013-09-28 00:06:03 +08:00
datibbaw
6442e49b22 forgot introspection changes 2013-09-28 00:06:03 +08:00
datibbaw
a88c7be88b added use_keys argument to array_filter() 2013-09-28 00:06:03 +08:00
Adam Harvey
9e3bedcd73 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix the broken sh syntax in ext/imap/config.m4.
 2013-09-20 14:21:28 -07:00
Adam Harvey
3f64d35559 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix the broken sh syntax in ext/imap/config.m4.
 2013-09-20 14:19:01 -07:00
Adam Harvey
cc66eaa04b Fix the broken sh syntax in ext/imap/config.m4. 
Patch by ryotakatsuki at gmail dot com. Fixes bug #65721 (configure script
broken in 5.5.4 and 5.4.20 when enabling imap).
 2013-09-20 14:15:19 -07:00
Anatol Belski
ac562b027b Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #65678 the test cli_process_title_windows will fails on particular environnement
 2013-09-20 16:01:11 +02:00
Anatol Belski
8f146c2bb0 Fixed bug #65678 the test cli_process_title_windows will fails on particular environnement 
Patch by Pierre Renaudet
 2013-09-20 15:59:33 +02:00
Christopher Jones
dcafcd01a9 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Added application/pdf to PHP CLI Web Server mime types.
 2013-09-19 20:23:18 -07:00
Christopher Jones
dfa43d55dd Added application/pdf to PHP CLI Web Server mime types. 2013-09-19 20:22:50 -07:00
Christopher Jones
d879d3de1e Merge branch 'PHP-5.5' 
* PHP-5.5:
 2013-09-19 20:22:12 -07:00
Christopher Jones
6ee3472a5f Merge branch 'master' of https://git.php.net/repository/php-src 
# By Michael Wallner
# Via Michael Wallner
* 'master' of https://git.php.net/repository/php-src:
  add note about request_body and php://input
 2013-09-19 10:53:22 -07:00
Michael Wallner
11d60447f9 add note about request_body and php://input 2013-09-19 15:41:04 +02:00
Christopher Jones
b6d0cb0553 Build OCI8 2.0 on Windows with Oracle Database 12c libraries only 2013-09-18 19:50:32 -07:00
Christopher Jones
3d165224da Merge branch 'master' of https://git.php.net/repository/php-src 
# By Michael Wallner (18) and others
# Via David Soria Parra (8) and others
* 'master' of https://git.php.net/repository/php-src: (37 commits)
  better way to fix PRIu64 availability on windows
  Revert "EmptyIterator now implements Countable; fixes bug 60577"
  RFC 6598 reserved ip range starts at 100.64.0.0
  fix a very rare case of use of uninitialized value combined with a memleak
  fix test concurrency
  fix test concurrency
  fix test concurrency
  fix test concurrency
  fix test concurrency
  fix build - PRIu64 vs %I64u
  final bits
  we need to use the full stream wrapper for filters
  let the libsqlite3 symbols be exported in dll
  NEWS/UPGRADING{,.INTERNALS} notes about temp POST stream
  Exclude bison 3.0 by Mike
  NEWS for added reserved ip addresses according to RFC 6598
  Add RFC 6598 IPs to reserved addresses
  upload2G note
  NEWS for #60577
  NEWS for bug #64441
  ...
 2013-09-18 19:49:40 -07:00
Christopher Jones
c2b8a72673 Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 
# By David Soria Parra (6) and others
# Via David Soria Parra (5) and Michael Wallner (1)
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Revert "EmptyIterator now implements Countable; fixes bug 60577"
  RFC 6598 reserved ip range starts at 100.64.0.0
  fix a very rare case of use of uninitialized value combined with a memleak
  NEWS for added reserved ip addresses according to RFC 6598
  Add RFC 6598 IPs to reserved addresses
  NEWS for #60577
  NEWS for bug #64441
  Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
  EmptyIterator now implements Countable; fixes bug 60577
  News for bugfix #64157
  Bug 64157 Changed error message to make sense
 2013-09-18 19:49:36 -07:00
Christopher Jones
d5ba2d8a99 Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4 
# By David Soria Parra (6) and others
# Via David Soria Parra
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Revert "EmptyIterator now implements Countable; fixes bug 60577"
  RFC 6598 reserved ip range starts at 100.64.0.0
  fix a very rare case of use of uninitialized value combined with a memleak
  NEWS for added reserved ip addresses according to RFC 6598
  Add RFC 6598 IPs to reserved addresses
  NEWS for #60577
  NEWS for bug #64441
  Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
  EmptyIterator now implements Countable; fixes bug 60577
  News for bugfix #64157
  Bug 64157 Changed error message to make sense
 2013-09-18 19:49:30 -07:00
Anatol Belski
86dfe7be49 better way to fix PRIu64 availability on windows 2013-09-18 15:14:36 +02:00
David Soria Parra
dc7015d4e4 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Revert "EmptyIterator now implements Countable; fixes bug 60577"
 2013-09-18 15:06:58 +02:00
David Soria Parra
94e4c4df86 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Revert "EmptyIterator now implements Countable; fixes bug 60577"
 2013-09-18 15:06:51 +02:00
David Soria Parra
7a24ee13ec Revert "EmptyIterator now implements Countable; fixes bug 60577" 
This reverts commit 8a936e8eb9.
 2013-09-18 15:06:36 +02:00
David Soria Parra
58c6e05748 Merge branch 'PHP-5.5' 
* PHP-5.5:
  RFC 6598 reserved ip range starts at 100.64.0.0
 2013-09-18 14:29:02 +02:00
David Soria Parra
2eb5661886 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  RFC 6598 reserved ip range starts at 100.64.0.0
 2013-09-18 14:28:57 +02:00
David Soria Parra
7e9044b6a2 RFC 6598 reserved ip range starts at 100.64.0.0 2013-09-18 14:27:58 +02:00
Michael Wallner
33c4b61c7f Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix a very rare case of use of uninitialized value combined with a memleak
 2013-09-18 11:12:44 +02:00
Michael Wallner
a34b141e08 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix a very rare case of use of uninitialized value combined with a memleak
 2013-09-18 11:12:11 +02:00
Michael Wallner
9bfd55cda3 fix a very rare case of use of uninitialized value combined with a 
memleak
 2013-09-18 11:10:55 +02:00
Michael Wallner
cdf5d201ab fix test concurrency 2013-09-18 11:02:45 +02:00
Michael Wallner
e9877fe92e fix test concurrency 2013-09-18 10:53:11 +02:00
Michael Wallner
14d5341787 fix test concurrency 2013-09-18 10:52:51 +02:00
Michael Wallner
6866b45a48 fix test concurrency 2013-09-18 10:52:35 +02:00
Michael Wallner
002763fb7b fix test concurrency 2013-09-18 10:52:18 +02:00
Anatol Belski
4a85b5e190 fix build - PRIu64 vs %I64u 2013-09-17 16:02:08 +02:00
Michael Wallner
e6084da473 final bits 2013-09-17 13:59:49 +02:00
Michael Wallner
423c70fb4d Merge branch 'slim-postdata-merge' 
* slim-postdata-merge:
  remove unused code
  tests
  make reading php://input JIT if enable_post_data_reading=0
  revert stream cast
  fix ZTS build
  slim post data

Conflicts:
	ext/soap/soap.c
	ext/standard/php_fopen_wrapper.c
	main/SAPI.c
 2013-09-17 13:52:25 +02:00
Michael Wallner
0f78d8612a we need to use the full stream wrapper for filters 2013-09-17 13:44:50 +02:00
Anatol Belski
41d78110ff let the libsqlite3 symbols be exported in dll 2013-09-17 13:05:44 +02:00
Michael Wallner
512734b58d Merge remote-tracking branch 'refs/remotes/origin/master' 
* refs/remotes/origin/master:
  Exclude bison 3.0 by Mike
 2013-09-17 11:10:38 +02:00
Michael Wallner
4a3936ef4a NEWS/UPGRADING{,.INTERNALS} notes about temp POST stream 2013-09-17 11:08:23 +02:00
Xinchen Hui
be581ec66d Exclude bison 3.0 by Mike 2013-09-17 16:54:27 +08:00
Michael Wallner
1c15d70cbd Merge branch 'slim-postdata' 
* slim-postdata:
  slim post data
  add NEWS entry; add simple test
  more precise condition
  make this work in vc11 too
  Use int64_t and atoll() after discussion with johannes
  ws
  Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files above 2G.
 2013-09-17 10:50:49 +02:00
David Soria Parra
52ff129607 Merge branch 'PHP-5.5' 
* PHP-5.5:
  NEWS for added reserved ip addresses according to RFC 6598
  Add RFC 6598 IPs to reserved addresses
 2013-09-17 09:55:59 +02:00
David Soria Parra
5e3da04fb0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS for added reserved ip addresses according to RFC 6598
  Add RFC 6598 IPs to reserved addresses
 2013-09-17 09:55:03 +02:00
David Soria Parra
dfd7d1063a NEWS for added reserved ip addresses according to RFC 6598 2013-09-17 09:54:58 +02:00
Sebastian Nohn
7c279df6ae Add RFC 6598 IPs to reserved addresses 
(cherry picked from commit b3f5b822e9)
 2013-09-17 09:52:53 +02:00
Michael Wallner
552f22abae upload2G note 2013-09-17 08:04:07 +02:00
David Soria Parra
ca75e6f760 Merge branch 'PHP-5.5' 
* PHP-5.5:
  NEWS for #60577
  NEWS for bug #64441
  Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
  EmptyIterator now implements Countable; fixes bug 60577
  News for bugfix #64157
  Bug 64157 Changed error message to make sense
 2013-09-16 23:36:48 +02:00
David Soria Parra
3d6ac70e66 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS for #60577
  NEWS for bug #64441
  Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
  EmptyIterator now implements Countable; fixes bug 60577
  News for bugfix #64157
  Bug 64157 Changed error message to make sense
 2013-09-16 23:36:37 +02:00