php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 11:13:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
71,476 Commits 549 Branches 1,486 Tags
5ebbdecfeaaea1bc78450a2bb6d5ee280bf18dbd
Commit Graph

30335 Commits

Author SHA1 Message Date
Pierrick Charron 9ab45d3edb Add missing constants in cURL 2012-08-25 01:21:17 -04:00
Pierrick Charron e5ff3f18f5 Update bad versions for cURL constants 
This was updated according to the cURL symbol tables located here :
http://curl.haxx.se/libcurl/c/symbols-in-versions.html
 2012-08-24 18:04:16 -04:00
Xinchen Hui a3d701e11c Merge branch 'PHP-5.4' 2012-08-23 23:28:24 +08:00
Xinchen Hui 42f91d6ac6 Fixed bug #62904 (Crash when cloning an object which inherits SplFixedArray) 2012-08-23 23:21:25 +08:00
Anatoliy Belsky 8b0a87f1c3 Merge branch 'PHP-5.4' 
* PHP-5.4:
  fixing test for upcoming mpir upgrade
 2012-08-23 17:12:49 +02:00
Anatoliy Belsky 9a72b52a1f fixing test for upcoming mpir upgrade 
- mpir is going to be upgraded up to 2.5.1 on windows
 2012-08-23 17:09:45 +02:00
Gustavo André dos Santos Lopes d9f5b1e9bc Merge branch '5.4' 
* 5.4:
  Fix SPOOFCHECKER_METHOD_FETCH_OBJECT definition
 2012-08-23 10:33:13 +01:00
Gustavo André dos Santos Lopes d212a5d391 Fix SPOOFCHECKER_METHOD_FETCH_OBJECT definition 2012-08-23 10:32:05 +01:00
Felipe Pena 058e2947fa Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed ZTS build
 2012-08-22 19:40:05 -03:00
Felipe Pena b98fc4379f - Fixed ZTS build 2012-08-22 19:39:57 -03:00
Gustavo Lopes b9eae3d67c Fix handling of several uinitialized intl objects 
Master specific changes. Not having this in the merge commit helps
porting to pecl/intl
 2012-08-22 22:54:43 +02:00
Gustavo Lopes fcd4420dbf Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix handling of several uinitialized intl objects
  Fix handling of several uinitialized intl objects
  - Fix NEWS
  - BFN

Conflicts:
	ext/intl/dateformat/dateformat.c
 2012-08-22 22:53:07 +02:00
Gustavo Lopes cd1f45b3be Fix handling of several uinitialized intl objects 
PHP 5.4 specific changes. Not having this in the merge commit helps
porting to pecl/intl
 2012-08-22 22:38:31 +02:00
Gustavo Lopes 87803ace94 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix handling of several uinitialized intl objects
 2012-08-22 22:37:52 +02:00
Gustavo Lopes a5d0c1e21b Fix handling of several uinitialized intl objects 2012-08-22 22:32:51 +02:00
andrey 815874c646 plug a leak when the server ask the client for a auth protocol, that 
the client doesn't understand. This is 5.5 specific bug, as a result
of a refactoring in 5.5
 2012-08-22 20:04:42 +02:00
Felipe Pena 596e855feb Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #62892 (ReflectionClass::getTraitAliases crashes on importing trait methods as private)
 2012-08-22 10:51:06 -03:00
Felipe Pena 7a56ac00a0 - Fixed bug #62892 (ReflectionClass::getTraitAliases crashes on importing trait methods as private) 2012-08-22 10:50:50 -03:00
Xinchen Hui 2af7a76822 Merge branch 'PHP-5.4' 2012-08-22 13:52:04 +08:00
Xinchen Hui 4e561055a4 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-22 13:49:04 +08:00
Xinchen Hui e5bdd2c0ee Fixed bug #62885 (mysqli_poll - Segmentation fault) 2012-08-22 13:41:47 +08:00
Felipe Pena 8830cd5be4 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Removed PHP 6 checks
 2012-08-21 20:16:12 -03:00
Felipe Pena b0dbf71466 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - Removed PHP 6 checks
 2012-08-21 20:15:48 -03:00
Felipe Pena 85fa4d7747 - Removed PHP 6 checks 2012-08-21 20:15:34 -03:00
Xinchen Hui 460d258e57 Merge branch 'PHP-5.4' 2012-08-21 22:19:23 +08:00
Xinchen Hui cd34067aec skip test properly 2012-08-21 22:15:54 +08:00
Xinchen Hui 60ad16e11f skip test properly 2012-08-21 22:11:22 +08:00
Anatoliy Belsky 47abbd1b4f Merge branch 'PHP-5.4' 
* PHP-5.4:
  Added test for bug #51353. It'll be skipped by default and must be activated manually.
  Bug 62462: adjusting test
 2012-08-21 13:27:52 +02:00
Anatoliy Belsky d304527253 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Added test for bug #51353. It'll be skipped by default and must be activated manually.
 2012-08-21 13:24:54 +02:00
Anatoliy Belsky 92153dcfe3 Added test for bug #51353. It'll be skipped by default and must be 
activated manually.
 2012-08-21 13:22:00 +02:00
Lars Strojny c4fecc1c5d Merge branch 'master' of git://github.com/php/php-src 2012-08-21 10:09:56 +02:00
Lars Strojny 7b6ebd97e7 Merge branch 'PHP-5.4' of git://github.com/php/php-src into PHP-5.4 2012-08-21 10:09:23 +02:00
Lars Strojny aaa2eee4c0 Bug 62462: adjusting test 2012-08-21 10:09:05 +02:00
Lars Strojny a45e81d093 Bug 62462: adjusting test 2012-08-21 10:08:46 +02:00
Xinchen Hui f8d9cabd11 Merge branch 'PHP-5.4' 2012-08-21 15:23:53 +08:00
Xinchen Hui c1284f21a7 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-21 15:23:09 +08:00
Reeze Xia 0cdc1f5626 Move test files to tests dir 
There are 7 files duplicated, so those files was deleted
 2012-08-21 14:32:39 +08:00
Xinchen Hui 546b0e4a99 Merge branch 'PHP-5.4' 2012-08-21 13:33:23 +08:00
Xinchen Hui 8722173ad5 Implemented FR #62840 (Add sort flag to ArrayObject::ksort) 2012-08-21 13:32:15 +08:00
Lars Strojny 18bb426587 Bug 62462: Prevent multibyte characters from being split between the lines 
Merged from https://github.com/php/php-src/pull/120
 2012-08-20 23:47:20 +02:00
Lars Strojny c54d73d54c Bug 62462: Prevent multibyte characters from being split between the lines 
Merged from https://github.com/php/php-src/pull/120
 2012-08-20 23:46:50 +02:00
Xinchen Hui cc5631eca3 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-20 23:44:21 +08:00
Popa Marius Adrian 33d872d9f3 skip test for bug 43130 on firebird , not relevant 2012-08-20 17:25:56 +03:00
Popa Adrian Marius b9a050100c skip test for bug 43130 on firebird , not relevant 2012-08-20 16:56:37 +03:00
Stanislav Malyshev 9ccf854198 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix for #62844
  relative-scheme
  bug #62844; relative URL schemes in parse_url()
 2012-08-19 22:20:30 -07:00
Andrew Faulds 4ec29b945c relative-scheme 2012-08-19 22:16:07 -07:00
Andrew Faulds 36b88d77f2 bug #62844; relative URL schemes in parse_url() 2012-08-19 22:15:58 -07:00
Stanislav Malyshev 5ee3bf1647 add finally 2012-08-19 21:43:16 -07:00
Stanislav Malyshev 3336e1e78c Merge branch 'pull-request/31' 
* pull-request/31:
  Fix lexing of nested heredoc strings in token_get_all()
 2012-08-19 21:43:04 -07:00
Felipe Pena cd18e20101 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Value stored to var is never used
 2012-08-19 15:09:20 -03:00