clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-03 07:46:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,609 Commits 494 Branches 1,367 Tags 810 MiB
cf5d7d9e73
Commit Graph

7870 Commits

Author SHA1 Message Date
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
Matt Ficken
bf5506f511 Fix Test Bug #64714 2013-04-25 11:34:57 -07:00
Stanislav Malyshev
84e5c8a0e2 update credits 2013-04-23 22:02:57 -07:00
Stanislav Malyshev
5e24a6e74d Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #64458 (dns_get_record result with string of length -1)
 2013-04-23 21:45:49 -07:00
Stanislav Malyshev
2a15aed399 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #64458 (dns_get_record result with string of length -1)
 2013-04-23 21:45:10 -07:00
Stanislav Malyshev
f87d2ab893 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #64458 (dns_get_record result with string of length -1)
 2013-04-23 21:43:55 -07:00
Stanislav Malyshev
18fdab5a09 Fix bug #64458 (dns_get_record result with string of length -1) 2013-04-23 21:43:35 -07:00
Pierrick Charron
b79e65f268 Remove curl wrappers 2013-04-23 17:01:17 -04:00
Sara Golemon
734e165d4e array_column() - Use entire subject array when NULL passed for second param. 
This starts to look like array_values(), except that you can reindex the arrays
using the third parameter.
 2013-04-22 16:19:21 -07:00
Sara Golemon
1a03bd5dee Allow array_column() to take -1 as a valid value in third param 
Also do some cleanup and simplification to make this code more
readable in the long term.
 2013-04-22 15:54:21 -07:00
Sara Golemon
f63db963c4 Harden array_column_basic.phpt against resource renumbering. 
We don't care what resource number it is, so long as there's a
stream resource returned.
 2013-04-22 13:36:40 -07:00
Anatol Belski
8febe2ad08 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed stream_socket_pair() on Windows x64 and
 2013-04-22 18:59:11 +02:00
Anatol Belski
f082d6311b Fixed stream_socket_pair() on Windows x64 and 
improved errorhandling in the socketpair() implementation.
 2013-04-22 18:55:32 +02:00
Sara Golemon
7b34324f84 Fix handling of double keys in array_column 
Also fix resource test to not localize __FILE__ to cwd.
 2013-04-21 22:35:04 -07:00
Anatol Belski
f578bb0388 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated NEWS
  Fixed stream_socket_pair() on Windows x64 and
 2013-04-22 19:00:13 +02:00
Johannes Schlüter
9587cf385e Improve warning when trying to load zend ext as PHP module 2013-04-04 15:36:46 +02:00
Xinchen Hui
01ca2bf8c3 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	ext/curl/interface.c
 2013-04-04 19:31:14 +08:00
Xinchen Hui
185e5e15ae s ,CURL_WRAPPERS_ENABLE,CURL_WRAPPERS_ENABLED, 2013-04-04 19:28:17 +08:00
Xinchen Hui
bbb4a44f98 Merge branch 'PHP-5.4' into PHP-5.5 2013-04-03 18:51:19 +08:00
ptarjan
99ad08f9a5 Fix #64572: Clean up after the test 
Lets not leave stuff lying around.
 2013-04-03 18:50:27 +08:00
Xinchen Hui
6ace9c646b Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	ext/curl/interface.c
 2013-04-03 10:15:41 +08:00
Xinchen Hui
78a9489f6a Use new constant replace ugly trick 2013-04-03 10:12:49 +08:00
Xinchen Hui
d8a5f41a60 Fixed bug parameter is casted to string of array_column 2013-04-01 19:11:45 +08:00
Xinchen Hui
ad7c0b1928 Merge branch 'PHP-5.4' into PHP-5.5 2013-03-31 21:26:26 +08:00
Xinchen Hui
72426a446d Skip test when --with-curlwrappers enabled. 2013-03-31 21:22:48 +08:00
Stanislav Malyshev
61fff1fd8b Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #64433: does not follow redirects for non-3xx response codes
 2013-03-30 21:24:21 -07:00
Sergey Akbarov
1d4fcdff9f Fix bug #64433: does not follow redirects for non-3xx response codes 2013-03-30 21:22:30 -07:00
Nikita Popov
dcf0b71c98 Fix tests after addition of ^ (xor) operator to ini 2013-03-28 18:35:46 +01:00
Xinchen Hui
f4daaf9250 Merge branch 'PHP-5.4' into PHP-5.5 2013-03-28 19:13:58 +08:00
Veres Lajos
124a867b6a Typo fix (greater then => greater than) 2013-03-28 19:12:08 +08:00
Pierre Joye
f01a7e54d3 add windows 8 and windows server 2012 2013-03-27 07:29:47 +01:00
Xinchen Hui
b29a9fa75d Merge branch 'PHP-5.4' into PHP-5.5 2013-03-21 11:14:36 +08:00
Xinchen Hui
0fd3572f4e Fixed bug #64432 (more empty delimiter warning in strX methods) 2013-03-21 11:14:10 +08:00
David Soria Parra
0173c4bab0 Merge branch 'pull-request/257' into PHP-5.5 
* pull-request/257:
  array_column: Fix compile-time warnings
  array_column: Removed array_pluck() alias
  array_column: Set array_pluck as an alias for array_column
  array_column: Implement ability to specify an index column
  Cleaning up a memory leak.
  array_column: Adding test for IS_OBJECT and converting object to string
  array_column: Using add_next_index_zval() at nikic's recommendation.
  array_column: Improved tests
  array_column: Cleaning up, as recommended in pull request #56 comments
  Fixing typo in test for array_column()
  Simplify the code and use zend_hash_next_index_insert()
  Adding test for columns not present in all rows for array_column().
  Adding tests for the negative results of array_column()
  Implement new array function array_column()
 2013-03-20 13:02:33 +01:00
Ben Ramsey
f5bf1ba88f array_column: Fix compile-time warnings 2013-03-19 20:44:19 -05:00
Anatol Belski
90c8f16c3b Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Backported patch for #64370
 2013-03-15 19:08:32 +01:00
Anatol Belski
b903d2d6cd Backported patch for #64370 2013-03-15 19:04:40 +01:00
Nikita Popov
28634bf603 Forgot to remove some now unused variables 2013-03-12 17:39:20 +01:00
Nikita Popov
fcc6611de9 Add support for non-scalar Iterator keys in foreach 
RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
 2013-03-12 17:27:31 +01:00
Anatol Belski
278c4097c6 fixed the test 2013-03-11 16:14:39 +01:00
Anatol Belski
8aaa09636a Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT']) 2013-03-11 16:04:37 +01:00
Xinchen Hui
1be745ce1b Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	ext/standard/var_unserializer.c
 2013-03-09 23:10:48 +08:00
Xinchen Hui
f52b2e6a65 Fixed bug #64354 (Unserialize array of objects whose class can't be autoloaded fail) 
about the __sleep one, since php_serialize_* are all void function,
so,,only check exception at the very begining
 2013-03-09 23:00:58 +08:00
Carson McDonald
0c11cab919 Typo fix: recieved to received 2013-03-07 23:05:05 +01:00
Xinchen Hui
2413fa6fbb Fix test after the convert_to_long be improved, see #64290 2013-03-03 11:13:52 +08:00
Sara Golemon
ead2e1708d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  http-stream test requires network connectivity
 2013-02-21 03:22:09 -08:00
Sara Golemon
c16d6befd4 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  http-stream test requires network connectivity
 2013-02-21 03:21:49 -08:00
Sara Golemon
bc55a8eb9f http-stream test requires network connectivity 2013-02-21 03:21:23 -08:00
Stanislav Malyshev
0c6d903ce7 fix bug #49348 - issue notice on get_property_ptr_ptr when used for read 2013-02-18 20:56:02 -08:00